From 6dabfa356fe836469e32e4af357e6858688821a5 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Sat, 4 Jan 2020 11:07:35 -0500
Subject: [PATCH 001/130] Add download test scripts.

These helper scripts check the status of docker, composer, and daily downloads.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 monitoring/README.rst                         | 13 +++++
 monitoring/check_phpmyadmin_composer.sh       | 22 +++++++
 .../check_phpmyadmin_daily_snapshots.py       | 50 ++++++++++++++++
 monitoring/check_phpmyadmin_docker.sh         | 58 +++++++++++++++++++
 4 files changed, 143 insertions(+)
 create mode 100644 monitoring/README.rst
 create mode 100755 monitoring/check_phpmyadmin_composer.sh
 create mode 100755 monitoring/check_phpmyadmin_daily_snapshots.py
 create mode 100755 monitoring/check_phpmyadmin_docker.sh

diff --git a/monitoring/README.rst b/monitoring/README.rst
new file mode 100644
index 0000000..619d9d0
--- /dev/null
+++ b/monitoring/README.rst
@@ -0,0 +1,13 @@
+Scripts for monitoring downloads
+================================
+
+These scripts are for monitoring daily snapshot downloads as well as the Composer and Docker packages.
+
+Of particular note, the daily snapshot tool requires some extra Python package, BeautifulSoup4.
+
+On Debian, this is probably available as ``python3-bs4``.
+
+Aside from Debian, I suggest creating a venv for this. I did it with ``python3 -m venv daily_snapshot_venv`` then source that with
+``source daily_snapshot_venv/bin/activate``.
+Install 'beautifulsoup4' to the venv.
+
diff --git a/monitoring/check_phpmyadmin_composer.sh b/monitoring/check_phpmyadmin_composer.sh
new file mode 100755
index 0000000..a2d2b55
--- /dev/null
+++ b/monitoring/check_phpmyadmin_composer.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+supported_versions=$(curl -fsSL 'https://www.phpmyadmin.net/home_page/version.json'|jq -r '.releases|.[]|.version')
+working_dir="$HOME/tmp/composer-test"
+
+mkdir -p "$working_dir"
+cd "$working_dir" || exit 1
+
+test_version() {
+	ver=$1
+	echo "Processing $ver"
+
+  composer create-project -q phpmyadmin/phpmyadmin "$ver" "$ver" > /dev/null
+  grep "$ver" "$ver/ChangeLog" > /dev/null || echo "Failed to find version $ver in $ver/ChangeLog" 
+  rm -rf "$ver"
+}
+
+while read -r full_version
+# https://unix.stackexchange.com/questions/9784/how-can-i-read-line-by-line-from-a-variable-in-bash
+do
+  test_version "$full_version"
+done < <(printf '%s\n' "$supported_versions")
\ No newline at end of file
diff --git a/monitoring/check_phpmyadmin_daily_snapshots.py b/monitoring/check_phpmyadmin_daily_snapshots.py
new file mode 100755
index 0000000..54fd23b
--- /dev/null
+++ b/monitoring/check_phpmyadmin_daily_snapshots.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+
+# I suggest creating a venv for this. I did it with `python3 -m venv daily_snapshot_venv` then source that with `source daily_snapshot_venv/bin/activate`.
+# Install 'beautifulsoup4' to the venv
+
+# This program checks that the phpMyAdmin daily downloads are within a day or two of the current time.
+# We allow an extra day of wiggle room because of the possibility of working in different time zones.
+#
+# Written by Isaac Bennetch <bennetch@gmail.com>
+
+import urllib.request
+try:
+    from bs4 import BeautifulSoup
+except ModuleNotFoundError:
+    print("The BeautifulSoup modue is not available. Please make sure you have the proper module or are running the correct venv.")
+    raise SystemExit
+import datetime
+
+#############
+# Main code #
+#############
+
+
+download_url = 'https://www.phpmyadmin.net/downloads/'
+
+page = urllib.request.urlopen(download_url)
+soup = BeautifulSoup(page, 'html.parser')
+full_text = soup.get_text()
+split = full_text.split("generated")
+
+today_date = datetime.date.today()
+
+# Process each instance of the keyword on the page, because we can have multiple QA and master versions
+for substring in split:
+  # Take only the date, not the entire page following it
+  generated_date = substring.split()[0]
+  # Strip off the trailing comma
+  if generated_date.endswith(','):
+    generated_date = generated_date[:-1]
+  if generated_date != 'phpMyAdmin':
+    converted_date = datetime.datetime.strptime(generated_date, '%Y-%m-%d').date()
+    difference = today_date - converted_date
+    # We give an extra day as a buffer to account for time zones
+    if difference > datetime.timedelta(days=1):
+      print("Problem found")
+      print("Current date: " + today_date.strftime('%Y-%m-%d'))
+      print("Snapshot date: " + generated_date)
+    else:
+      print("Everything is groovy")
+
diff --git a/monitoring/check_phpmyadmin_docker.sh b/monitoring/check_phpmyadmin_docker.sh
new file mode 100755
index 0000000..90b9951
--- /dev/null
+++ b/monitoring/check_phpmyadmin_docker.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# This script will get a list of currently supported versions from phpmyadmin.net.
+# For each version, it pulls the Docker image for each flavor, including major and minor
+# version shortcuts (5, 5.0, and 5.0.0). We check that the expected version is listed in ChangeLog.
+# 
+# This does not currently test 'edge' development versions.
+# Future versions could use jq to parse package.json for the "version" field
+# 
+# Written by Isaac Bennetch <bennetch@gmail.com>
+
+supported_versions=$(curl -fsSL 'https://www.phpmyadmin.net/home_page/version.json'|jq -r '.releases|.[]|.version')
+
+if [ "$1" == "-h" ] || [ "$1" == "--help" ]
+then
+  echo "Checks whether the docker builds are current to the versions presented in the version.json file from phpmyadmin.net"
+  echo 
+  echo "Possible arguments:"
+  echo "  -v --verbose    Prints some progress output (usually runs silently)"
+  echo "  -h --help       Prints this help message"
+  exit
+fi
+
+if [ "$1" == "-v" ] || [ "$1" == "--verbose" ]
+then
+  verbose=true
+else
+  verbose=false
+fi
+
+test_version() {
+	ver=$1
+  nodots=${ver//[-.]/}
+  container=ptest-$nodots
+  for flavor in "$ver" "$ver-fpm" "$ver-fpm-alpine"
+  do
+    if [ "$verbose" == true ]
+    then
+      echo "Processing $flavor"
+    fi
+
+    docker pull -q phpmyadmin/phpmyadmin:"$flavor" > /dev/null
+    docker run --name "$container" -d phpmyadmin/phpmyadmin:"$flavor" > /dev/null
+    docker exec -t "$container" grep "$ver" ChangeLog > /dev/null || echo "Failed to find version $ver in $container"
+    docker container stop "$container" > /dev/null
+    docker container rm "$container" > /dev/null
+  done
+}
+
+while read -r full_version
+# https://unix.stackexchange.com/questions/9784/how-can-i-read-line-by-line-from-a-variable-in-bash
+do
+	major="${full_version:0:1}"
+	minor="${full_version:0:3}"
+	test_version "$full_version"
+	test_version "$minor"
+	test_version "$major"
+done < <(printf '%s\n' "$supported_versions")

From c7ea07b3ac3d47d7f3a4227db1be25bc0d2f6360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 4 Feb 2020 23:18:10 -0300
Subject: [PATCH 002/130] Add twig-i18n-extension to phpmyadmin-reports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 phpmyadmin-reports | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpmyadmin-reports b/phpmyadmin-reports
index 3975e41..017be56 100755
--- a/phpmyadmin-reports
+++ b/phpmyadmin-reports
@@ -43,6 +43,7 @@ PROJECTS = (
     'phpmyadmin/simple-math',
     'phpmyadmin/localized_docs',
     'phpmyadmin/error-reporting-server',
+    'phpmyadmin/twig-i18n-extension',
 )
 # Only include commits not present elsewhere from this repository
 PROJECT_EXTRA_COMMITS = (

From 38c6067929dfff57dc0a5fb5c79fbbf90c8e810b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sun, 24 May 2020 12:21:13 -0300
Subject: [PATCH 003/130] Clear routes cache on demo server
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 demo/bin/pma-demo-update | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index c0fb45e..2002f1f 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -75,6 +75,10 @@ for REPONAME in $REPOS ; do
         yarn install --non-interactive --silent > /dev/null
     fi
 
+    if [ -f libraries/cache/routes.cache.php ] ; then
+        rm -f libraries/cache/routes.cache.php
+    fi
+
     # Link themes
     for THEME in $THEMES ; do
         if [ ! -e themes/$THEME ] ; then

From 46a5570d5e63f0fba2230db8d3c89f6b04b1625f Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 16 Jun 2020 09:29:26 +0200
Subject: [PATCH 004/130] Build docker edge-5.0

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-snapshots | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index 05f32c6..7995612 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -34,3 +34,6 @@ cd /home/builder/website/
 
 # Trigger docker build for edge-4.9
 ./manage.py docker_trigger --tag edge-4.9
+
+# Trigger docker build for edge-5.0
+./manage.py docker_trigger --tag edge-5.0

From 76447425bcf07abde3689454cfc7b966d1f5f9ee Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 16 Jun 2020 09:31:07 +0200
Subject: [PATCH 005/130] Make BUILDER_ROOT variable in develdocs build script

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 develdocs/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/develdocs/build.sh b/develdocs/build.sh
index 7fc6662..33e8b50 100755
--- a/develdocs/build.sh
+++ b/develdocs/build.sh
@@ -4,7 +4,7 @@
 # on develdocs.phpmyadmin.net
 
 # Update scripts
-BUILDER_ROOT="/home/builder"
+BUILDER_ROOT=${BUILDER_ROOT:-"/home/builder"}
 cd "$BUILDER_ROOT/scripts/"
 git pull -q
 

From 802b49bcf69c70cb1bbcd7cc71fbb2c4b3ea43da Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 16 Jun 2020 09:34:22 +0200
Subject: [PATCH 006/130] Make BUILDER_REPO_NAME variable in develdocs build
 script

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 develdocs/build.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/develdocs/build.sh b/develdocs/build.sh
index 33e8b50..c8e63ed 100755
--- a/develdocs/build.sh
+++ b/develdocs/build.sh
@@ -5,7 +5,8 @@
 
 # Update scripts
 BUILDER_ROOT=${BUILDER_ROOT:-"/home/builder"}
-cd "$BUILDER_ROOT/scripts/"
+BUILDER_REPO="$BUILDER_ROOT/${BUILDER_REPO_NAME:-scripts}"
+cd "$BUILDER_REPO"
 git pull -q
 
 # Update doc build environment
@@ -17,16 +18,16 @@ for repo in phpmyadmin sql-parser motranslator shapefile simple-math ; do
     cd "$BUILDER_ROOT/$repo"
     git pull -q
     # Clean output
-    rm -rf "$BUILDER_ROOT/scripts/develdocs/output/$repo/"
+    rm -rf "$BUILDER_REPO/develdocs/output/$repo/"
     # Generate config file
-    nice -19 "$BUILDER_ROOT/scripts/develdocs/sami.php" \
+    nice -19 "$BUILDER_REPO/develdocs/sami.php" \
     --root "$BUILDER_ROOT/$repo" \
-    --build-dir "$BUILDER_ROOT/scripts/develdocs/output/$repo/" \
-    --cache-dir "$BUILDER_ROOT/scripts/develdocs/tmp/$repo/" \
-    --output-config "$BUILDER_ROOT/scripts/develdocs/sami-$repo.php" \
+    --build-dir "$BUILDER_REPO/develdocs/output/$repo/" \
+    --cache-dir "$BUILDER_REPO/develdocs/tmp/$repo/" \
+    --output-config "$BUILDER_REPO/develdocs/sami-$repo.php" \
     --title-of-composer
     # Render
-    nice -19 "$BUILDER_ROOT/scripts/develdocs/vendor/bin/sami.php" update  "$BUILDER_ROOT/scripts/develdocs/sami-$repo.php"
+    nice -19 "$BUILDER_REPO/develdocs/vendor/bin/sami.php" update  "$BUILDER_REPO/develdocs/sami-$repo.php"
     # Delete config file
-    rm "$BUILDER_ROOT/scripts/develdocs/sami-$repo.php"
+    rm "$BUILDER_REPO/develdocs/sami-$repo.php"
 done

From 60992f3b7a0d1a4d9f7cdc83288e5015ffb271a1 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 18 Jul 2020 11:33:30 +0200
Subject: [PATCH 007/130] Use Doctum in replacement of Sami

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 develdocs/build.sh      | 10 ++++-----
 develdocs/composer.json |  2 +-
 develdocs/doctum.php    | 48 +++++++++++++++++++++++++++++++++++++++++
 develdocs/sami.php      | 38 --------------------------------
 4 files changed, 54 insertions(+), 44 deletions(-)
 create mode 100755 develdocs/doctum.php
 delete mode 100755 develdocs/sami.php

diff --git a/develdocs/build.sh b/develdocs/build.sh
index c8e63ed..aae5c2c 100755
--- a/develdocs/build.sh
+++ b/develdocs/build.sh
@@ -20,14 +20,14 @@ for repo in phpmyadmin sql-parser motranslator shapefile simple-math ; do
     # Clean output
     rm -rf "$BUILDER_REPO/develdocs/output/$repo/"
     # Generate config file
-    nice -19 "$BUILDER_REPO/develdocs/sami.php" \
+    nice -19 "$BUILDER_REPO/develdocs/doctum.php" \
     --root "$BUILDER_ROOT/$repo" \
     --build-dir "$BUILDER_REPO/develdocs/output/$repo/" \
     --cache-dir "$BUILDER_REPO/develdocs/tmp/$repo/" \
-    --output-config "$BUILDER_REPO/develdocs/sami-$repo.php" \
-    --title-of-composer
+    --slug "phpmyadmin/$repo" \
+    --output-config "$BUILDER_REPO/develdocs/doctum-$repo.php"
     # Render
-    nice -19 "$BUILDER_REPO/develdocs/vendor/bin/sami.php" update  "$BUILDER_REPO/develdocs/sami-$repo.php"
+    nice -19 "$BUILDER_REPO/develdocs/vendor/bin/doctum.php" update  "$BUILDER_REPO/develdocs/doctum-$repo.php"
     # Delete config file
-    rm "$BUILDER_REPO/develdocs/sami-$repo.php"
+    rm "$BUILDER_REPO/develdocs/doctum-$repo.php"
 done
diff --git a/develdocs/composer.json b/develdocs/composer.json
index 229df2f..2aa096a 100644
--- a/develdocs/composer.json
+++ b/develdocs/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "sami/sami": "^4.0"
+        "code-lts/doctum": "^5.0"
     }
 }
diff --git a/develdocs/doctum.php b/develdocs/doctum.php
new file mode 100755
index 0000000..86b6335
--- /dev/null
+++ b/develdocs/doctum.php
@@ -0,0 +1,48 @@
+#!/usr/bin/php
+<?php
+$_CLI = getopt('', array('slug:', 'root:', 'build-dir:', 'cache-dir:', 'output-config:', 'title::', 'title-of-composer'));
+
+$SOURCE = 'src';
+
+if (is_dir($_CLI['root'] . '/src') === false) {
+    $SOURCE = 'libraries';
+}
+
+
+$output = <<<'EOT'
+<?php
+/**
+ * This file has been generated by phpmyadmin/scripts/develdocs/build.sh
+ * @see https://github.com/phpmyadmin/scripts/blob/master/develdocs/doctum.php
+ * @see https://github.com/phpmyadmin/scripts/blob/master/develdocs/build.sh
+ */
+use Doctum\Doctum;
+use Symfony\Component\Finder\Finder;
+use Doctum\RemoteRepository\GitHubRemoteRepository;
+
+$iterator = Finder::create()
+    ->files()
+    ->name('*.php')
+    ->in('%s');
+
+return new Doctum($iterator, [
+    'title'                => json_decode(file_get_contents('%s'))->description,
+    'build_dir'            => '%s',
+    'cache_dir'            => '%s',
+    'remote_repository'    => new GitHubRemoteRepository('%s', '%s'),
+]);
+EOT;
+
+$root = rtrim($_CLI['root'], '/') . '/';
+
+$output = sprintf(
+    $output,
+    $root . $SOURCE,
+    $root . 'composer.json',
+    $_CLI['build-dir'],
+    $_CLI['cache-dir'],
+    $_CLI['slug'],
+    $root
+);
+
+file_put_contents($_CLI['output-config'], $output);
diff --git a/develdocs/sami.php b/develdocs/sami.php
deleted file mode 100755
index 933c47f..0000000
--- a/develdocs/sami.php
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/php
-<?php
-$_CLI = getopt("", array("root:", "build-dir:", "cache-dir:", "output-config:", "title::", "title-of-composer"));
-
-$SOURCE = 'src';
-
-if (is_dir($_CLI['root'].'/src') == false) {
-    $SOURCE = 'libraries';
-}
-
-if (isset($_CLI['title-of-composer'])) {
-    $contents = file_get_contents($_CLI['root'].'/composer.json');
-    $_CLI['title'] = json_decode($contents)->description;
-}
-
-$output = '<?php
-/**
- * This file has been generated by phpmyadmin/scripts:/develdocs/build.sh
- * @see https://github.com/phpmyadmin/scripts/blob/master/develdocs/sami.php
- * @see https://github.com/phpmyadmin/scripts/blob/master/develdocs/build.sh
- */
-use Sami\Sami;
-use Symfony\Component\Finder\Finder;
-
-$iterator = Finder::create()
-    ->files()
-    ->name("*.php")
-    ->in("'.$_CLI['root'].'/'.$SOURCE.'")
-;
-
-return new Sami($iterator, [
-    "title"                => "'.$_CLI["title"].'",
-    "build_dir"            => "'.$_CLI["build-dir"].'",
-    "cache_dir"            => "'.$_CLI["cache-dir"].'"
-]);
-';
-
-file_put_contents($_CLI['output-config'], $output);

From ed7edd038e1b265c9572c37b5971dc34f5bf72ac Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 19 Jul 2020 12:39:40 +0200
Subject: [PATCH 008/130] Improve develdocs page

---
 develdocs/output/index.html | 95 ++++++++++++++++++++++++++++++++-----
 1 file changed, 83 insertions(+), 12 deletions(-)

diff --git a/develdocs/output/index.html b/develdocs/output/index.html
index 8ffa34d..43efdd2 100644
--- a/develdocs/output/index.html
+++ b/develdocs/output/index.html
@@ -1,14 +1,85 @@
-<html>
-<head><title>phpMyAdmin developer documentation</title></head>
+<!doctype html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="Auto-generated phpMyAdmin developer documentation">
+    <meta name="author" content="phpMyAdmin team and contributors">
+    <title>phpMyAdmin developer documentation</title>
+
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.0/css/bootstrap.min.css"
+        integrity="sha512-rO2SXEKBSICa/AfyhEK5ZqWFCOok1rcgPYfGOqtX35OyiraBg6Xa4NnBJwXgpIRoXeWjcAmcQniMhp22htDc6g=="
+        crossorigin="anonymous" />
+
+</head>
+
 <body>
-<h1>phpMyAdmin developer documentation</h2>
-
-<ul>
-<li><a href="/phpmyadmin/">phpMyAdmin itself</a></li>
-<li><a href="/motranslator/">motranslator</a></li>
-<li><a href="/shapefile/">shapefile</a></li>
-<li><a href="/sql-parser/">sql-parser</a></li>
-<li><a href="/simple-math/">simple-math</a></li>
-</ul>
+    <header>
+        <div class="navbar navbar-dark bg-dark shadow-sm">
+            <div class="container d-flex justify-content-between">
+                <div class="card-footer"></div>
+            </div>
+        </div>
+    </header>
+
+    <main role="main">
+
+        <section class="jumbotron text-center">
+            <div class="container">
+                <h1>phpMyAdmin developer documentation</h1>
+                <p class="lead text-muted">You will find auto-generated documentations for the projects bellow.</p>
+            </div>
+        </section>
+        <div class="col-12">
+            <div class="card-group">
+                <div class="col-1">&nbsp;</div>
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title">phpMyAdmin</h5>
+                        <p class="card-text">A web interface for MySQL and MariaDB</p>
+                    </div>
+                    <div class="card-footer text-center"><a href="/phpmyadmin/" class="card-link">Documentation</a>
+                    </div>
+                </div>
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title">motranslator</h5>
+                        <p class="card-text">Translation API for PHP using Gettext MO
+                            files</p>
+                    </div>
+                    <div class="card-footer text-center"><a href="/motranslator/" class="card-link">Documentation</a>
+                    </div>
+                </div>
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title">shapefile</h5>
+                        <p class="card-text">ESRI ShapeFile library for PHP</p>
+                    </div>
+                    <div class="card-footer text-center"><a href="/shapefile/" class="card-link">Documentation</a></div>
+                </div>
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title">sql-parser</h5>
+                        <p class="card-text">A validating SQL lexer and parser with a
+                            focus on MySQL dialect
+                        </p>
+                    </div>
+                    <div class="card-footer text-center"><a href="/sql-parser/" class="card-link">Documentation</a>
+                    </div>
+                </div>
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title">simple-math</h5>
+                        <p class="card-text">Simple math evaluator</p>
+                    </div>
+                    <div class="card-footer text-center"><a href="/simple-math/" class="card-link">Documentation</a>
+                    </div>
+                </div>
+                <div class="col-1">&nbsp;</div>
+            </div>
+        </div>
+    </main>
 </body>
-</html>
+
+</html>
\ No newline at end of file

From 81c51c9acdac1198edba65b85a4b31b32327419e Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 19 Jul 2020 13:52:15 +0200
Subject: [PATCH 009/130] Fix a typo on the develdocs page

---
 develdocs/output/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/develdocs/output/index.html b/develdocs/output/index.html
index 43efdd2..8cab315 100644
--- a/develdocs/output/index.html
+++ b/develdocs/output/index.html
@@ -28,7 +28,7 @@
         <section class="jumbotron text-center">
             <div class="container">
                 <h1>phpMyAdmin developer documentation</h1>
-                <p class="lead text-muted">You will find auto-generated documentations for the projects bellow.</p>
+                <p class="lead text-muted">You will find auto-generated documentations for the projects below.</p>
             </div>
         </section>
         <div class="col-12">

From 24445c08d953962e4f874be8f082750f9ad8f4ac Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 8 Oct 2020 21:45:41 +0200
Subject: [PATCH 010/130] Apply coding standard from the main repo

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/lib/github.php | 97 ++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/hooks/lib/github.php b/hooks/lib/github.php
index 1f63dad..53cef46 100644
--- a/hooks/lib/github.php
+++ b/hooks/lib/github.php
@@ -3,25 +3,27 @@
  * GitHub operations layer.
  */
 
-if (!defined('PMAHOOKS')) {
+if (! defined('PMAHOOKS')) {
     fail('Invalid invocation!');
 }
 
-require_once('./config.php');
+require_once './config.php';
 
-$curl_base_opts = array(
+$curl_base_opts = [
     CURLOPT_USERPWD => GITHUB_USERNAME . ':' . GITHUB_PASSWORD,
     CURLOPT_USERAGENT => 'phpMyAdmin-bot',
     CURLOPT_RETURNTRANSFER => 1,
     CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-    CURLOPT_HTTPHEADER => array('Content-Type: application/json'),
-);
+    CURLOPT_HTTPHEADER => ['Content-Type: application/json'],
+];
 
 /**
  * Builds the body of the email to send
  *
- * @param stdClass $inputData The JSON payload
  * @see https://developer.github.com/v3/activity/events/types/#pushevent
+ *
+ * @param stdClass $inputData The JSON payload
+ *
  * @return stdClass {
  *       "repoName": "org/repo",
  *       "compare": "URL TO COMPARE PAGE",
@@ -39,26 +41,25 @@ function gihub_webhook_push(stdClass $inputData): stdClass
     $msg .= 'Home: ' . $inputData->repository->html_url . PHP_EOL;
 
     foreach ($inputData->commits as $commit) {
-    $msg .= 'Commit: ' . $commit->id . PHP_EOL;
-    $msg .= $commit->url . PHP_EOL;
-    $msg .= 'Author: ' . $commit->author->name . ' <' . $commit->author->email . '>' . PHP_EOL;
-
-    $date = new DateTime($commit->timestamp);
-    $msg .= 'Date: ' . $date->format('Y-m-d (D, m F Y) P') . PHP_EOL . PHP_EOL;
-
-    $msg .= 'Changed paths: ' . PHP_EOL;
-    foreach ($commit->added as $file) {
-        $msg .= 'A ' . $file . PHP_EOL;
-    }
-    foreach ($commit->modified as $file) {
-        $msg .= 'M ' . $file . PHP_EOL;
-    }
-    foreach ($commit->removed as $file) {
-        $msg .= 'D ' . $file . PHP_EOL;
-    }
-    $msg .= PHP_EOL . 'Log Message:' . PHP_EOL . '-----------' . PHP_EOL;
-    $msg .= $commit->message . PHP_EOL . PHP_EOL;
-
+        $msg .= 'Commit: ' . $commit->id . PHP_EOL;
+        $msg .= $commit->url . PHP_EOL;
+        $msg .= 'Author: ' . $commit->author->name . ' <' . $commit->author->email . '>' . PHP_EOL;
+
+        $date = new DateTime($commit->timestamp);
+        $msg .= 'Date: ' . $date->format('Y-m-d (D, m F Y) P') . PHP_EOL . PHP_EOL;
+
+        $msg .= 'Changed paths: ' . PHP_EOL;
+        foreach ($commit->added as $file) {
+            $msg .= 'A ' . $file . PHP_EOL;
+        }
+        foreach ($commit->modified as $file) {
+            $msg .= 'M ' . $file . PHP_EOL;
+        }
+        foreach ($commit->removed as $file) {
+            $msg .= 'D ' . $file . PHP_EOL;
+        }
+        $msg .= PHP_EOL . 'Log Message:' . PHP_EOL . '-----------' . PHP_EOL;
+        $msg .= $commit->message . PHP_EOL . PHP_EOL;
     }
 
     $data = new stdClass();
@@ -69,10 +70,10 @@ function gihub_webhook_push(stdClass $inputData): stdClass
     $data->headCommitShortHash = substr($inputData->commits[0]->id, 0, 6);
     $data->authorName          = $inputData->commits[0]->author->name;
     $data->authorEmail         = $inputData->commits[0]->author->email;
+
     return $data;
 }
 
-
 /**
  * Verifies signature from GitHub
  */
@@ -81,24 +82,26 @@ function github_verify_post()
     if (empty(GITHUB_HOOK_SECRET)) {
         fail('Missing hook secret configuration!');
     }
-    if (!isset($_SERVER['HTTP_X_HUB_SIGNATURE'])) {
+    if (! isset($_SERVER['HTTP_X_HUB_SIGNATURE'])) {
         fail("HTTP header 'X-Hub-Signature' is missing.");
-    } elseif (!extension_loaded('hash')) {
+    } elseif (! extension_loaded('hash')) {
         fail("Missing 'hash' extension to check the secret code validity.");
     }
 
-    list($algo, $hash) = explode('=', $_SERVER['HTTP_X_HUB_SIGNATURE'], 2) + array('', '');
-    if (!in_array($algo, array('sha1', 'sha256', 'sha512'), true)) {
+    [$algo, $hash] = explode('=', $_SERVER['HTTP_X_HUB_SIGNATURE'], 2) + ['', ''];
+    if (! in_array($algo, ['sha1', 'sha256', 'sha512'], true)) {
         fail("Hash algorithm '$algo' is not allowed.");
     }
-    if (!in_array($algo, hash_algos(), true)) {
+    if (! in_array($algo, hash_algos(), true)) {
         fail("Hash algorithm '$algo' is not supported.");
     }
     $rawPost = file_get_contents('php://input');
     $newhash = hash_hmac($algo, $rawPost, GITHUB_HOOK_SECRET);
-    if (! hash_equals($hash, $newhash)) {
-        fail('Hook secret does not match.');
+    if (hash_equals($hash, $newhash)) {
+        return;
     }
+
+    fail('Hook secret does not match.');
 }
 
 /**
@@ -108,20 +111,20 @@ function github_make_release($repo, $tag, $version, $description)
 {
     $ch = curl_init();
 
-    $result = array(
-        'release' => array(
+    $result = [
+        'release' => [
             'project' => $repo,
             'tag' => $tag,
             'version' => $version,
-            'description' => $description
-        )
-    );
+            'description' => $description,
+        ],
+    ];
 
     //set the url, number of POST vars, POST data
     curl_setopt_array($ch, $GLOBALS['curl_base_opts']);
     curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/' . $repo . '/releases');
     curl_setopt($ch, CURLOPT_POST, 1);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(array('tag_name' => $tag, 'name' => $version, 'body' => $description)));
+    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['tag_name' => $tag, 'name' => $version, 'body' => $description]));
 
     //execute post
     $response = curl_exec($ch);
@@ -145,7 +148,7 @@ function github_comment_pull($repo, $pullid, $comment)
     curl_setopt_array($ch, $GLOBALS['curl_base_opts']);
     curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/' . $repo . '/issues/' . $pullid . '/comments');
     curl_setopt($ch, CURLOPT_POST, 1);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(array('body' => $comment)));
+    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['body' => $comment]));
 
     //execute post
     $result = curl_exec($ch);
@@ -167,7 +170,7 @@ function github_comment_commit($repo, $sha, $comment)
     curl_setopt_array($ch, $GLOBALS['curl_base_opts']);
     curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/' . $repo . '/commits/' . $sha . '/comments');
     curl_setopt($ch, CURLOPT_POST, 1);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(array('body' => $comment)));
+    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['body' => $comment]));
 
     //execute post
     $result = curl_exec($ch);
@@ -273,14 +276,12 @@ function trigger_docs_render()
  *
  * @param mixed $data JSON data to print
  */
-function json_response($data, $status='success', $message=null)
+function json_response($data, $status = 'success', $message = null)
 {
     header('Content-Type: application/json; charset=UTF-8');
     header('X-Content-Type-Options: nosniff');
 
-    $response = array(
-        'status' => $status
-    );
+    $response = ['status' => $status];
     if (isset($data)) {
         $response['data'] = $data;
     }
@@ -294,10 +295,10 @@ function json_response($data, $status='success', $message=null)
 /**
  * Terminates request with error
  */
-function fail($message, $code=500)
+function fail($message, $code = 500)
 {
     http_response_code($code);
     json_response(null, 'error', $message);
 
-    die();
+    die;
 }

From a5c72178bc460cdab4a15e214b314c0208414954 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 8 Oct 2020 21:46:22 +0200
Subject: [PATCH 011/130] Fix some typos

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/lib/github.php | 6 +++---
 hooks/push.php       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hooks/lib/github.php b/hooks/lib/github.php
index 53cef46..92edb57 100644
--- a/hooks/lib/github.php
+++ b/hooks/lib/github.php
@@ -34,7 +34,7 @@
  *       "authorEmail": "williamdes@wdes.fr"
  * }
  */
-function gihub_webhook_push(stdClass $inputData): stdClass
+function github_webhook_push(stdClass $inputData): stdClass
 {
     $msg  = '';
     $msg .= 'Branch: ' . $inputData->ref . PHP_EOL;
@@ -200,7 +200,7 @@ function github_pull_commits($repo, $pullid)
 }
 
 /**
- * Returns diff of pull request commit detal.
+ * Returns diff of pull request commit detail.
  */
 function github_commit_detail($repo, $commit)
 {
@@ -218,7 +218,7 @@ function github_commit_detail($repo, $commit)
 }
 
 /**
- * Returns diff of pull request commit detal.
+ * Returns diff of pull request commit detail.
  */
 function github_commit_comments($repo, $sha)
 {
diff --git a/hooks/push.php b/hooks/push.php
index 6c51bb2..50cc47a 100644
--- a/hooks/push.php
+++ b/hooks/push.php
@@ -36,7 +36,7 @@
     die();
 }
 
-$data = gihub_webhook_push($inputData);
+$data = github_webhook_push($inputData);
 
 
 $mail = new PHPMailer(true);

From 14a2b6f1991d766140680920ed3abf854e36a49d Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 8 Oct 2020 21:51:01 +0200
Subject: [PATCH 012/130] #25 - Remove GitHub user password auth method

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/config-example.php | 4 ++--
 hooks/lib/github.php     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/hooks/config-example.php b/hooks/config-example.php
index 5bfd5be..64bc344 100644
--- a/hooks/config-example.php
+++ b/hooks/config-example.php
@@ -1,8 +1,8 @@
 <?php
 
-define('GITHUB_HOOK_SECRET', 'passwordddddd');
+define('GITHUB_HOOK_SECRET', 'xxxxxxxxxxxxxxREPLACEMExxxxxxxxxxxxxxxxxx');
 define('GITHUB_USERNAME', 'phpmyadmin-bot');
-define('GITHUB_PASSWORD', 'password');
+define('GITHUB_TOKEN', 'xxxxxxxxxxxxxxREPLACEMExxxxxxxxxxxxxxxxxx');
 define('SMTP_SEND_TO', 'maillist@example.org');
 define('SMTP_SEND_FROM_EMAIL', 'mail@example.org');// Optional
 define('SMTP_SEND_BACK_TO', 'maillist@example.org');// Optional
diff --git a/hooks/lib/github.php b/hooks/lib/github.php
index 92edb57..142d466 100644
--- a/hooks/lib/github.php
+++ b/hooks/lib/github.php
@@ -10,7 +10,6 @@
 require_once './config.php';
 
 $curl_base_opts = [
-    CURLOPT_USERPWD => GITHUB_USERNAME . ':' . GITHUB_PASSWORD,
     CURLOPT_USERAGENT => 'phpMyAdmin-bot',
     CURLOPT_RETURNTRANSFER => 1,
     CURLOPT_HTTPAUTH => CURLAUTH_BASIC,

From 496a33d9e1146dad75be94537a1ce557c9614996 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 8 Oct 2020 21:51:25 +0200
Subject: [PATCH 013/130] Use global keyword

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/lib/github.php | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/hooks/lib/github.php b/hooks/lib/github.php
index 142d466..2b766a1 100644
--- a/hooks/lib/github.php
+++ b/hooks/lib/github.php
@@ -9,7 +9,7 @@
 
 require_once './config.php';
 
-$curl_base_opts = [
+$curlBaseOpts = [
     CURLOPT_USERAGENT => 'phpMyAdmin-bot',
     CURLOPT_RETURNTRANSFER => 1,
     CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
@@ -108,6 +108,8 @@ function github_verify_post()
  */
 function github_make_release($repo, $tag, $version, $description)
 {
+    global $curlBaseOpts;
+
     $ch = curl_init();
 
     $result = [
@@ -120,7 +122,7 @@ function github_make_release($repo, $tag, $version, $description)
     ];
 
     //set the url, number of POST vars, POST data
-    curl_setopt_array($ch, $GLOBALS['curl_base_opts']);
+    curl_setopt_array($ch, $curlBaseOpts);
     curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/' . $repo . '/releases');
     curl_setopt($ch, CURLOPT_POST, 1);
     curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['tag_name' => $tag, 'name' => $version, 'body' => $description]));
@@ -141,10 +143,12 @@ function github_make_release($repo, $tag, $version, $description)
  */
 function github_comment_pull($repo, $pullid, $comment)
 {
+    global $curlBaseOpts;
+
     $ch = curl_init();
 
     //set the url, number of POST vars, POST data
-    curl_setopt_array($ch, $GLOBALS['curl_base_opts']);
+    curl_setopt_array($ch, $curlBaseOpts);
     curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/' . $repo . '/issues/' . $pullid . '/comments');
     curl_setopt($ch, CURLOPT_POST, 1);
     curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['body' => $comment]));
@@ -163,10 +167,12 @@ function github_comment_pull($repo, $pullid, $comment)
  */
 function github_comment_commit($repo, $sha, $comment)
 {
+    global $curlBaseOpts;
+
     $ch = curl_init();
 
     //set the url, number of POST vars, POST data
-    curl_setopt_array($ch, $GLOBALS['curl_base_opts']);
+    curl_setopt_array($ch, $curlBaseOpts);
     curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/' . $repo . '/commits/' . $sha . '/comments');
     curl_setopt($ch, CURLOPT_POST, 1);
     curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['body' => $comment]));
@@ -185,8 +191,10 @@ function github_comment_commit($repo, $sha, $comment)
  */
 function github_pull_commits($repo, $pullid)
 {
+    global $curlBaseOpts;
+
     $ch = curl_init();
-    curl_setopt_array($ch, $GLOBALS['curl_base_opts']);
+    curl_setopt_array($ch, $curlBaseOpts);
     curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/' . $repo . '/pulls/' . $pullid . '/commits');
 
     //execute post
@@ -203,8 +211,10 @@ function github_pull_commits($repo, $pullid)
  */
 function github_commit_detail($repo, $commit)
 {
+    global $curlBaseOpts;
+
     $ch = curl_init();
-    curl_setopt_array($ch, $GLOBALS['curl_base_opts']);
+    curl_setopt_array($ch, $curlBaseOpts);
     curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/' . $repo . '/commits/' . $commit);
 
     //execute post
@@ -221,8 +231,10 @@ function github_commit_detail($repo, $commit)
  */
 function github_commit_comments($repo, $sha)
 {
+    global $curlBaseOpts;
+
     $ch = curl_init();
-    curl_setopt_array($ch, $GLOBALS['curl_base_opts']);
+    curl_setopt_array($ch, $curlBaseOpts);
     curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/' . $repo . '/commits/' . $sha . '/comments');
 
     //execute post
@@ -239,8 +251,10 @@ function github_commit_comments($repo, $sha)
  */
 function github_pull_diff($repo, $pullid)
 {
+    global $curlBaseOpts;
+
     $ch = curl_init();
-    curl_setopt_array($ch, $GLOBALS['curl_base_opts']);
+    curl_setopt_array($ch, $curlBaseOpts);
     curl_setopt($ch, CURLOPT_URL, 'https://github.com/' . $repo . '/pull/' . $pullid . '.patch');
 
     //execute post

From 40dba87b40017b3a9e1dff87588d26b7ec7777aa Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 8 Oct 2020 21:58:41 +0200
Subject: [PATCH 014/130] Fixes #25 - Migrate to token auth

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/lib/github.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hooks/lib/github.php b/hooks/lib/github.php
index 2b766a1..adbf9d1 100644
--- a/hooks/lib/github.php
+++ b/hooks/lib/github.php
@@ -12,8 +12,11 @@
 $curlBaseOpts = [
     CURLOPT_USERAGENT => 'phpMyAdmin-bot',
     CURLOPT_RETURNTRANSFER => 1,
-    CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-    CURLOPT_HTTPHEADER => ['Content-Type: application/json'],
+    CURLOPT_HTTPHEADER => [
+        'Content-Type: application/json',
+        'Authorization: token ' . GITHUB_TOKEN,
+
+    ],
 ];
 
 /**

From a7064dc204ef8fbfc16c1c641d85580cf837f6f7 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 8 Oct 2020 22:01:20 +0200
Subject: [PATCH 015/130] Document #25 token auth

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/config-example.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hooks/config-example.php b/hooks/config-example.php
index 64bc344..a8fd362 100644
--- a/hooks/config-example.php
+++ b/hooks/config-example.php
@@ -2,7 +2,7 @@
 
 define('GITHUB_HOOK_SECRET', 'xxxxxxxxxxxxxxREPLACEMExxxxxxxxxxxxxxxxxx');
 define('GITHUB_USERNAME', 'phpmyadmin-bot');
-define('GITHUB_TOKEN', 'xxxxxxxxxxxxxxREPLACEMExxxxxxxxxxxxxxxxxx');
+define('GITHUB_TOKEN', 'xxxxxxxxxxxxxxREPLACEMExxxxxxxxxxxxxxxxxx');// https://github.com/settings/tokens/new scopes: repo, workflow
 define('SMTP_SEND_TO', 'maillist@example.org');
 define('SMTP_SEND_FROM_EMAIL', 'mail@example.org');// Optional
 define('SMTP_SEND_BACK_TO', 'maillist@example.org');// Optional

From 7bb8a6e6422efc1f303ded01a40969cf738fc816 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 8 Oct 2020 22:17:42 +0200
Subject: [PATCH 016/130] Document WEBSITE_HOOK and DOCS_HOOK

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/config-example.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hooks/config-example.php b/hooks/config-example.php
index a8fd362..c3ff9aa 100644
--- a/hooks/config-example.php
+++ b/hooks/config-example.php
@@ -12,3 +12,6 @@
 define('SMTP_MODE', 'tls');// ssl or tls
 define('SMTP_USERNAME', 'mail@example.org');
 define('SMTP_PASSWORD', 'P@ssw0rd12345');
+
+define('WEBSITE_HOOK', 'https://example.org/replaceme-by-an-url');
+define('DOCS_HOOK', 'https://example.org/replaceme-by-an-url');

From b38e4dfff2b4600d51504706953b5c6b9c5254ae Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 8 Oct 2020 22:27:07 +0200
Subject: [PATCH 017/130] Handle tag pushes

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/lib/github.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hooks/lib/github.php b/hooks/lib/github.php
index adbf9d1..3987735 100644
--- a/hooks/lib/github.php
+++ b/hooks/lib/github.php
@@ -68,10 +68,12 @@ function github_webhook_push(stdClass $inputData): stdClass
     $data->repoName            = $inputData->repository->full_name;
     $data->compare             = $inputData->compare;
     $data->emailBody           = $msg;
-    $data->headCommitTitle     = explode("\n", $inputData->commits[0]->message)[0];
-    $data->headCommitShortHash = substr($inputData->commits[0]->id, 0, 6);
-    $data->authorName          = $inputData->commits[0]->author->name;
-    $data->authorEmail         = $inputData->commits[0]->author->email;
+    // Commits can be empty and head_commit filled in case of a tag
+    $firstCommit = $inputData->commits[0] ?? $inputData->head_commit;
+    $data->headCommitTitle     = explode("\n", $firstCommit->message)[0];
+    $data->headCommitShortHash = substr($firstCommit->id, 0, 6);
+    $data->authorName          = $firstCommit->author->name;
+    $data->authorEmail         = $firstCommit->author->email;
 
     return $data;
 }

From 46cfa10337a33c5d9f029173475088c4a1049248 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 8 Oct 2020 23:06:14 +0200
Subject: [PATCH 018/130] Make files require use __DIR__

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/commits.php        | 2 +-
 hooks/create.php         | 2 +-
 hooks/create_release.php | 2 +-
 hooks/docs.php           | 2 +-
 hooks/lib/github.php     | 2 +-
 hooks/push.php           | 8 ++++----
 hooks/website.php        | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hooks/commits.php b/hooks/commits.php
index d50b931..438153f 100644
--- a/hooks/commits.php
+++ b/hooks/commits.php
@@ -7,7 +7,7 @@
 
 define('PMAHOOKS', true);
 
-require_once('./lib/github.php');
+require_once __DIR__ . '/lib/github.php';
 
 github_verify_post();
 
diff --git a/hooks/create.php b/hooks/create.php
index df47885..13a850f 100644
--- a/hooks/create.php
+++ b/hooks/create.php
@@ -7,7 +7,7 @@
 
 define('PMAHOOKS', true);
 
-require_once('./lib/github.php');
+require_once __DIR__ . '/lib/github.php';
 
 github_verify_post();
 
diff --git a/hooks/create_release.php b/hooks/create_release.php
index f0ad9c5..9047205 100644
--- a/hooks/create_release.php
+++ b/hooks/create_release.php
@@ -7,7 +7,7 @@
 
 define('PMAHOOKS', true);
 
-require_once('./lib/github.php');
+require_once __DIR__ . '/lib/github.php';
 
 github_verify_post();
 
diff --git a/hooks/docs.php b/hooks/docs.php
index 10fef39..487e035 100644
--- a/hooks/docs.php
+++ b/hooks/docs.php
@@ -7,6 +7,6 @@
 
 define('PMAHOOKS', true);
 
-require_once('./lib/github.php');
+require_once __DIR__ . '/lib/github.php';
 
 trigger_docs_render();
diff --git a/hooks/lib/github.php b/hooks/lib/github.php
index 3987735..753066e 100644
--- a/hooks/lib/github.php
+++ b/hooks/lib/github.php
@@ -7,7 +7,7 @@
     fail('Invalid invocation!');
 }
 
-require_once './config.php';
+require_once __DIR__ . '/../config.php';
 
 $curlBaseOpts = [
     CURLOPT_USERAGENT => 'phpMyAdmin-bot',
diff --git a/hooks/push.php b/hooks/push.php
index 50cc47a..e1d404c 100644
--- a/hooks/push.php
+++ b/hooks/push.php
@@ -11,15 +11,15 @@
 
 define('PMAHOOKS', true);
 
-require_once(__DIR__.'/lib/github.php');
+require_once __DIR__ . '/lib/github.php';
 
-if ( !is_file(__DIR__.'/vendor/autoload.php')) {
-    fail("Run composer install");
+if ( !is_file(__DIR__ . '/vendor/autoload.php')) {
+    fail('Run composer install');
     exit;
 }
 
 //Load Composer's autoloader
-require_once(__DIR__.'/vendor/autoload.php');
+require_once __DIR__ . '/vendor/autoload.php';
 
 github_verify_post();
 
diff --git a/hooks/website.php b/hooks/website.php
index 593ae55..f8a130f 100644
--- a/hooks/website.php
+++ b/hooks/website.php
@@ -7,7 +7,7 @@
 
 define('PMAHOOKS', true);
 
-require_once('./lib/github.php');
+require_once __DIR__ . '/lib/github.php';
 
 github_verify_post();
 

From db39b0e4afb7b7852db1728011a20d8f34aa6cd4 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 8 Oct 2020 23:08:04 +0200
Subject: [PATCH 019/130] Throw an error on hook failure

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/lib/github.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/hooks/lib/github.php b/hooks/lib/github.php
index 753066e..56f19bc 100644
--- a/hooks/lib/github.php
+++ b/hooks/lib/github.php
@@ -135,6 +135,8 @@ function github_make_release($repo, $tag, $version, $description)
     //execute post
     $response = curl_exec($ch);
 
+    continueOrFailOnHttpCode(curl_getinfo($ch, CURLINFO_HTTP_CODE));
+
     //close connection
     curl_close($ch);
 
@@ -161,6 +163,8 @@ function github_comment_pull($repo, $pullid, $comment)
     //execute post
     $result = curl_exec($ch);
 
+    continueOrFailOnHttpCode(curl_getinfo($ch, CURLINFO_HTTP_CODE));
+
     //close connection
     curl_close($ch);
 
@@ -185,6 +189,8 @@ function github_comment_commit($repo, $sha, $comment)
     //execute post
     $result = curl_exec($ch);
 
+    continueOrFailOnHttpCode(curl_getinfo($ch, CURLINFO_HTTP_CODE));
+
     //close connection
     curl_close($ch);
 
@@ -205,6 +211,8 @@ function github_pull_commits($repo, $pullid)
     //execute post
     $result = curl_exec($ch);
 
+    continueOrFailOnHttpCode(curl_getinfo($ch, CURLINFO_HTTP_CODE));
+
     //close connection
     curl_close($ch);
 
@@ -225,6 +233,8 @@ function github_commit_detail($repo, $commit)
     //execute post
     $result = curl_exec($ch);
 
+    continueOrFailOnHttpCode(curl_getinfo($ch, CURLINFO_HTTP_CODE));
+
     //close connection
     curl_close($ch);
 
@@ -245,6 +255,8 @@ function github_commit_comments($repo, $sha)
     //execute post
     $result = curl_exec($ch);
 
+    continueOrFailOnHttpCode(curl_getinfo($ch, CURLINFO_HTTP_CODE));
+
     //close connection
     curl_close($ch);
 
@@ -265,6 +277,8 @@ function github_pull_diff($repo, $pullid)
     //execute post
     $result = curl_exec($ch);
 
+    continueOrFailOnHttpCode(curl_getinfo($ch, CURLINFO_HTTP_CODE));
+
     //close connection
     curl_close($ch);
 
@@ -310,6 +324,13 @@ function json_response($data, $status = 'success', $message = null)
     echo json_encode($response, JSON_PRETTY_PRINT);
 }
 
+function continueOrFailOnHttpCode(int $httpCode): void
+{
+    if ($httpCode > 204) {
+        fail('Request failed with a code ' . $httpCode);
+    }
+}
+
 /**
  * Terminates request with error
  */

From 4eae099eeeb7ef3adf85ffe6e41f01cd7746c7a9 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Thu, 15 Oct 2020 18:39:15 -0500
Subject: [PATCH 020/130] Don't error if .css or .css.map files don't exist

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 website/daily-composer | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/daily-composer b/website/daily-composer
index 5008f3d..88dcb90 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -55,8 +55,8 @@ line_counts() {
 
 generate_css() {
     yarn install --non-interactive --silent
-    git add --force themes/*/css/*.css
-    git add --force themes/*/css/*.css.map
+    git add --force themes/*/css/*.css || echo "No css file found, not adding to git repository"
+    git add --force themes/*/css/*.css.map || echo "No css.map files found, not adding to git repository"
     if ! git diff --quiet --cached ; then
         git commit -m 'Update generated CSS files'
     fi

From 6b6dbbea0002cdcaad7af99d34551f11cd5c08fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Mon, 16 Nov 2020 14:11:49 -0300
Subject: [PATCH 021/130] Fix typo in demo/php/versions.ini
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 demo/php/versions.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index 9dea969..1c8eacd 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -1,7 +1,7 @@
 #
 # The demo server configuration
 #
-# It will get updated within one hour from commiting changes.
+# It will get updated within one hour from committing changes.
 
 [demo]
 # List of branches to show, master must come first.

From 219557a7336c8df5016aed4880ee8415ce55ef55 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 16 Nov 2020 18:12:10 +0100
Subject: [PATCH 022/130] Do not report tabs for phpstan-baseline.neon

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/commits.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hooks/commits.php b/hooks/commits.php
index 438153f..4358a62 100644
--- a/hooks/commits.php
+++ b/hooks/commits.php
@@ -137,7 +137,9 @@
     $files_eol = array();
     foreach ($detail['files'] as $file) {
         if (preg_match("@\n\+[^\n]*\t@", $file['patch'])) {
-            if (! preg_match('/^libraries\/advisory_rules.*\.txt$/', $file['filename'])) {
+            $matchAdvisory = preg_match('/^libraries\/advisory_rules.*\.txt$/', $file['filename']);
+            $matchPhpStan = preg_match('/^phpstan-baseline.neon$/', $file['filename']);
+            if (! $matchAdvisory && ! $matchPhpStan) {
                 $files_tab[] = $file['filename'];
             }
         }

From 3487520d561c8e691084a08d055484b629ac4177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Mon, 16 Nov 2020 14:15:51 -0300
Subject: [PATCH 023/130] Add darkmod-neo and darkwolf themes to Demo server
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 demo/php/versions.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index 1c8eacd..378046d 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -22,3 +22,5 @@ themes[] = metro
 themes[] = mhn
 themes[] = pmaterial
 themes[] = fallen
+themes[] = darkmod-neo
+themes[] = darkwolf

From 015c731548e45bd2d404c95d77e7b67e5b245b61 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 21 Nov 2020 23:05:23 +0100
Subject: [PATCH 024/130] Fix #38 - Set the default branch for
 GitHubRemoteRepository URLs

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 develdocs/build.sh   | 5 ++++-
 develdocs/doctum.php | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/develdocs/build.sh b/develdocs/build.sh
index aae5c2c..6e79bae 100755
--- a/develdocs/build.sh
+++ b/develdocs/build.sh
@@ -3,6 +3,8 @@
 # Script to generate phpdoc documentation of phpMyAdmin and publish it
 # on develdocs.phpmyadmin.net
 
+set -e
+
 # Update scripts
 BUILDER_ROOT=${BUILDER_ROOT:-"/home/builder"}
 BUILDER_REPO="$BUILDER_ROOT/${BUILDER_REPO_NAME:-scripts}"
@@ -24,10 +26,11 @@ for repo in phpmyadmin sql-parser motranslator shapefile simple-math ; do
     --root "$BUILDER_ROOT/$repo" \
     --build-dir "$BUILDER_REPO/develdocs/output/$repo/" \
     --cache-dir "$BUILDER_REPO/develdocs/tmp/$repo/" \
+    --docs-branch "master" \
     --slug "phpmyadmin/$repo" \
     --output-config "$BUILDER_REPO/develdocs/doctum-$repo.php"
     # Render
-    nice -19 "$BUILDER_REPO/develdocs/vendor/bin/doctum.php" update  "$BUILDER_REPO/develdocs/doctum-$repo.php"
+    nice -19 "$BUILDER_REPO/develdocs/vendor/bin/doctum.php" update --force --ignore-parse-errors "$BUILDER_REPO/develdocs/doctum-$repo.php"
     # Delete config file
     rm "$BUILDER_REPO/develdocs/doctum-$repo.php"
 done
diff --git a/develdocs/doctum.php b/develdocs/doctum.php
index 727e876..da2603c 100755
--- a/develdocs/doctum.php
+++ b/develdocs/doctum.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-$_CLI = getopt('', ['slug:', 'root:', 'build-dir:', 'cache-dir:', 'output-config:', 'title::', 'title-of-composer']);
+$_CLI = getopt('', ['slug:', 'root:', 'build-dir:', 'cache-dir:', 'docs-branch:', 'output-config:', 'title::', 'title-of-composer']);
 
 $SOURCE = 'src';
 
@@ -28,6 +28,7 @@
     'title'                => json_decode(file_get_contents('%s'))->description,
     'build_dir'            => '%s',
     'cache_dir'            => '%s',
+    'version'              => '%s',
     'remote_repository'    => new GitHubRemoteRepository('%s', '%s'),
 ]);
 EOT;
@@ -40,6 +41,7 @@
     $root . 'composer.json',
     $_CLI['build-dir'],
     $_CLI['cache-dir'],
+    $_CLI['docs-branch'],
     $_CLI['slug'],
     $root
 );

From 66aa8758ae125058a18c3905a26c4a192d69a551 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 7 Dec 2020 01:42:01 +0100
Subject: [PATCH 025/130] Improve baseline detection

See: 219557a7336c8df5016aed4880ee8415ce55ef55
Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/commits.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hooks/commits.php b/hooks/commits.php
index 4358a62..b9cd8cb 100644
--- a/hooks/commits.php
+++ b/hooks/commits.php
@@ -138,8 +138,12 @@
     foreach ($detail['files'] as $file) {
         if (preg_match("@\n\+[^\n]*\t@", $file['patch'])) {
             $matchAdvisory = preg_match('/^libraries\/advisory_rules.*\.txt$/', $file['filename']);
-            $matchPhpStan = preg_match('/^phpstan-baseline.neon$/', $file['filename']);
-            if (! $matchAdvisory && ! $matchPhpStan) {
+            // Example: https://api.github.com/repos/phpmyadmin/phpmyadmin/commits/b7cb1c84bacc5de1490a4e5cf241401cbfa5c105
+            $isABaseLineFile = in_array($file['filename'], [
+                'phpstan-baseline.neon',
+                'psalm-baseline.xml',
+            ]);
+            if (! $matchAdvisory && ! $isABaseLineFile) {
                 $files_tab[] = $file['filename'];
             }
         }

From 1e890a55e6c5e047a9b5a353a9eaaa076fa5be25 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 7 Dec 2020 01:45:25 +0100
Subject: [PATCH 026/130] Apply our coding standard on hooks/commits.php

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 hooks/commits.php | 111 ++++++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 53 deletions(-)

diff --git a/hooks/commits.php b/hooks/commits.php
index b9cd8cb..c42c245 100644
--- a/hooks/commits.php
+++ b/hooks/commits.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * GitHub webhook to check Signed-Off-By in pull request commits.
  */
@@ -13,60 +14,60 @@
 
 $contributing_url = 'https://github.com/phpmyadmin/phpmyadmin/blob/master/CONTRIBUTING.md';
 $guidelines_url = 'https://github.com/phpmyadmin/phpmyadmin/wiki/Developer_guidelines';
-$dco_link = 'https://github.com/phpmyadmin/phpmyadmin/blob/master/DCO';
+$dcoLink = 'https://github.com/phpmyadmin/phpmyadmin/blob/master/DCO';
 
 $message_sob = "<!-- PMABOT:SOB -->\n"
-    . "This commit is missing Signed-Off-By line to indicate "
+    . 'This commit is missing Signed-Off-By line to indicate '
     . "that you agree with phpMyAdmin Developer's Certificate of Origin. "
-    . "Please check [contributing documentation]("
+    . 'Please check [contributing documentation]('
     . $contributing_url
-    . ") for more information.";
+    . ') for more information.';
 
 $message_sob_invalid = "<!-- PMABOT:SOB --><!-- PMABOT:SOB:INVALID -->\n"
-    . "This commit has an invalid Signed-Off-By line, please use "
+    . 'This commit has an invalid Signed-Off-By line, please use '
     . "your full name for legal compliance reasons.\n"
-    . "Please check [Developer's Certificate of Origin]($dco_link)\n"
-    . "Here is a valid example: `Signed-off-by: Jane Smith <jane.smith@example.org>`";
+    . 'Please check [Developer\'s Certificate of Origin](' . $dcoLink . ")\n"
+    . 'Here is a valid example: `Signed-off-by: Jane Smith <jane.smith@example.org>`';
 
 $message_tab = "<!-- PMABOT:TAB -->\n"
-    . "This commit is using tab character for indentation instead "
-    . "of spaces, what is mandated by phpMyAdmin. Please check our "
-    . "[Developer guidelines]("
+    . 'This commit is using tab character for indentation instead '
+    . 'of spaces, what is mandated by phpMyAdmin. Please check our '
+    . '[Developer guidelines]('
     . $guidelines_url
-    . "#Indentation) for more information."
+    . '#Indentation) for more information.'
     . "\n\nOffending files: ";
 
 $message_space = "<!-- PMABOT:SPACE -->\n"
-    . "This commit contains trailing whitespace, "
-    . "what is prohibited in phpMyAdmin. Please check our "
-    . "[Developer guidelines]("
+    . 'This commit contains trailing whitespace, '
+    . 'what is prohibited in phpMyAdmin. Please check our '
+    . '[Developer guidelines]('
     . $guidelines_url
-    . "#Indentation) for more information."
+    . '#Indentation) for more information.'
     . "\n\nOffending files: ";
 
 $message_eol = "<!-- PMABOT:EOL -->\n"
-    . "This commit is using DOS end of line characters instead "
-    . "of UNIX ones, what is mandated by phpMyAdmin. Please check our "
-    . "[Developer guidelines]("
+    . 'This commit is using DOS end of line characters instead '
+    . 'of UNIX ones, what is mandated by phpMyAdmin. Please check our '
+    . '[Developer guidelines]('
     . $guidelines_url
-    . "#Indentation) for more information."
+    . '#Indentation) for more information.'
     . "\n\nOffending files: ";
 
 $message_commits = "<!-- PMABOT:COMMITS -->\n"
-    . "This pull requests contains too many commits, in most cases "
-    . "it is caused by wrong merge target. In case you have forked "
-    . "`master` branch you should also ask merging to `master` branch. "
-    . "See [GitHub documentation]"
-    . "(https://help.github.com/articles/creating-a-pull-request/) "
-    . "for more details.";
+    . 'This pull requests contains too many commits, in most cases '
+    . 'it is caused by wrong merge target. In case you have forked '
+    . '`master` branch you should also ask merging to `master` branch. '
+    . 'See [GitHub documentation]'
+    . '(https://help.github.com/articles/creating-a-pull-request/) '
+    . 'for more details.';
 
 /* Parse JSON */
 $data = json_decode($_POST['payload'], true);
 
 /* Check request data */
 if (isset($data['zen']) && isset($data['hook']) && isset($data['hook_id'])) {
-    json_response(array('pong' => true));
-    die();
+    json_response(['pong' => true]);
+    die;
 }
 
 if (! isset($data['pull_request']) || ! isset($data['action'])) {
@@ -75,13 +76,13 @@
 
 /* We don't care about closed requests */
 if ($data['action'] == 'closed') {
-    die();
+    die;
 }
 
 /* Check number of commits */
 if ($data['pull_request']['commits'] > 50) {
     github_comment_pull($data['repository']['full_name'], $data['pull_request']['number'], $message_commits);
-    die();
+    die;
 }
 
 /* Parse repository name */
@@ -90,7 +91,7 @@
 /* List commits in the pull request */
 $commits = github_pull_commits($data['repository']['full_name'], $data['pull_request']['number']);
 
-$comments = array();
+$comments = [];
 
 /* Process commits in the pull request */
 foreach ($commits as $commit) {
@@ -107,34 +108,34 @@
     }
 
     /* Check for missing SOB */
-    if ( ! preg_match("@\nSigned-off-by:@i", $commit['commit']['message'])) {
+    if (! preg_match("@\nSigned-off-by:@i", $commit['commit']['message'])) {
         if (strpos($comments_text, '<!-- PMABOT:SOB -->') === false) {
             github_comment_commit($repo_name, $commit['sha'], $message_sob);
-            $comments[] = array(
+            $comments[] = [
                 'type' => 'SOB',
                 'commit' => $commit['sha'],
                 'message' => $commit['commit']['message'],
-            );
+            ];
         }
     } else {
         /* Check for invalid SOB */
-        if ( ! preg_match("@\nSigned-off-by: +(?:[\p{L}\-\.]+\s){2,}<.*>@iu", $commit['commit']['message'])) {
+        if (! preg_match("@\nSigned-off-by: +(?:[\p{L}\-\.]+\s){2,}<.*>@iu", $commit['commit']['message'])) {
             if (strpos($comments_text, '<!-- PMABOT:SOB:INVALID -->') === false) {
                 github_comment_commit($repo_name, $commit['sha'], $message_sob_invalid);
-                $comments[] = array(
+                $comments[] = [
                     'type' => 'SOB',
                     'commit' => $commit['sha'],
                     'message' => $commit['commit']['message'],
-                );
+                ];
             }
         }
     }
 
     /* Check for tab or trailing whitespace in diff */
     $detail = github_commit_detail($data['repository']['full_name'], $commit['sha']);
-    $files_tab = array();
-    $files_space = array();
-    $files_eol = array();
+    $files_tab = [];
+    $files_space = [];
+    $files_eol = [];
     foreach ($detail['files'] as $file) {
         if (preg_match("@\n\+[^\n]*\t@", $file['patch'])) {
             $matchAdvisory = preg_match('/^libraries\/advisory_rules.*\.txt$/', $file['filename']);
@@ -150,34 +151,38 @@
         if (preg_match("@\n\+[^\n]* \n@", $file['patch'])) {
             $files_space[] = $file['filename'];
         }
-        if (preg_match("@\n\+[^\n]*\r@", $file['patch'])) {
-            $files_eol[] = $file['filename'];
+        if (! preg_match("@\n\+[^\n]*\r@", $file['patch'])) {
+            continue;
         }
+
+        $files_eol[] = $file['filename'];
     }
     if (count($files_tab) && strpos($comments_text, 'PMABOT:TAB') === false) {
         github_comment_commit($repo_name, $commit['sha'], $message_tab . implode(', ', $files_tab));
-        $comments[] = array(
+        $comments[] = [
             'type' => 'TAB',
             'commit' => $commit['sha'],
             'message' => $commit['commit']['message'],
-        );
+        ];
     }
     if (count($files_space) && strpos($comments_text, 'PMABOT:SPACE') === false) {
         github_comment_commit($repo_name, $commit['sha'], $message_space . implode(', ', $files_space));
-        $comments[] = array(
+        $comments[] = [
             'type' => 'SPACE',
             'commit' => $commit['sha'],
             'message' => $commit['commit']['message'],
-        );
+        ];
     }
-    if (count($files_eol) && strpos($comments_text, 'PMABOT:EOL') === false) {
-        github_comment_commit($repo_name, $commit['sha'], $message_eol . implode(', ', $files_eol));
-        $comments[] = array(
-            'type' => 'EOL',
-            'commit' => $commit['sha'],
-            'message' => $commit['commit']['message'],
-        );
+    if (! count($files_eol) || strpos($comments_text, 'PMABOT:EOL') !== false) {
+        continue;
     }
+
+    github_comment_commit($repo_name, $commit['sha'], $message_eol . implode(', ', $files_eol));
+    $comments[] = [
+        'type' => 'EOL',
+        'commit' => $commit['sha'],
+        'message' => $commit['commit']['message'],
+    ];
 }
 
-json_response(array('comments' => $comments));
+json_response(['comments' => $comments]);

From 50e8093751e22a76530f3bd1a12384f078e04105 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 20 Dec 2020 20:58:06 +0100
Subject: [PATCH 027/130] Upgrade Doctum to 5.3

---
 develdocs/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/develdocs/composer.json b/develdocs/composer.json
index 2aa096a..8a25c9a 100644
--- a/develdocs/composer.json
+++ b/develdocs/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "code-lts/doctum": "^5.0"
+        "code-lts/doctum": "^5.3"
     }
 }

From 2661b532f98567b28e1f31767d096f3cb5133f14 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 21 Dec 2020 14:14:39 +0100
Subject: [PATCH 028/130] Add QA_5_1 to demo server and daily-composer

Also reset master-release value
Ref: e58329d18976d4c4d19959edcdb71f83c9b806b8
---
 demo/php/versions.ini  | 3 ++-
 website/daily-composer | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index 378046d..0fd03d7 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -13,9 +13,10 @@ branches[] = master-config-nopmadb
 branches[] = STABLE
 branches[] = QA_4_9
 branches[] = QA_5_0
+branches[] = QA_5_1
 
 # Version of future release from master branch
-master-release = 5.1.0
+master-release = 5.2.0
 
 # List of themes to link
 themes[] = metro
diff --git a/website/daily-composer b/website/daily-composer
index 88dcb90..66fcc46 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -12,7 +12,7 @@ set -u
 DIR=~/composer
 
 # Branches we process
-BRANCHES="QA_5_0 QA_4_9 QA_4_8 QA_4_7 master"
+BRANCHES="QA_5_1 QA_5_0 QA_4_9 QA_4_8 QA_4_7 master"
 
 generate_readme() {
     cat > README.rst <<EOT

From 5ab83956c53a49747dcf3b28f807dfc14b87d23d Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Tue, 26 Jan 2021 09:17:26 -0500
Subject: [PATCH 029/130] Update daily snapshot list.

Remove 4.9 and 5.0, and master is now 5.2

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 website/daily-snapshots | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index 7995612..aa9e238 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -12,9 +12,8 @@ git pull -q
 rm -rf release
 
 # Create snapshots
-./scripts/create-release.sh --daily 4.9+snapshot QA_4_9
-./scripts/create-release.sh --daily 5.0+snapshot QA_5_0
-./scripts/create-release.sh --daily 5.1+snapshot master
+./scripts/create-release.sh --daily 5.1+snapshot QA_5_1
+./scripts/create-release.sh --daily 5.2+snapshot master
 
 # Storage directory
 mkdir -p /mnt/storage/files/snapshots/

From e9f4710c074184473b0b3c3f4a2aa8844efb0edc Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Wed, 24 Feb 2021 01:42:46 -0500
Subject: [PATCH 030/130] Remove demo version 5.0.x

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 demo/php/versions.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index 0fd03d7..a9ec7ee 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -12,7 +12,6 @@ branches[] = master-http
 branches[] = master-config-nopmadb
 branches[] = STABLE
 branches[] = QA_4_9
-branches[] = QA_5_0
 branches[] = QA_5_1
 
 # Version of future release from master branch

From 4e8935916cf611a24eba894381f4fea21756612a Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 25 Feb 2021 13:52:19 +0100
Subject: [PATCH 031/130] Generate JS files on composer version

Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/16681
Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index 66fcc46..9a00981 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -54,7 +54,7 @@ line_counts() {
 }
 
 generate_css() {
-    yarn install --non-interactive --silent
+    yarn install --non-interactive --silent --production
     git add --force themes/*/css/*.css || echo "No css file found, not adding to git repository"
     git add --force themes/*/css/*.css.map || echo "No css.map files found, not adding to git repository"
     if ! git diff --quiet --cached ; then
@@ -62,6 +62,14 @@ generate_css() {
     fi
 }
 
+generate_js() {
+    yarn install --non-interactive --silent --production
+    git add --force js/dist/ || echo "No JS files found, not adding to git repository"
+    if ! git diff --quiet --cached ; then
+        git commit -m 'Update generated JS files'
+    fi
+}
+
 # Ensure we have working dir
 if [ ! -d "$DIR" ] ; then
     git clone git@github.com:phpmyadmin/composer.git "$DIR"
@@ -101,6 +109,7 @@ for branch in $BRANCHES ; do
     generate_mo
     line_counts
     generate_css
+    generate_js
 
     # Push
     git push origin $newbranch
@@ -122,6 +131,7 @@ for tag in `git branch -r | grep 'phpmyadmin/tags/RELEASE_[45]_[7890]_[0-9]\+\(_
     generate_mo
     line_counts
     generate_css
+    generate_js
 
     # Create tag
     git tag -a -m "Composer tag for $tag" $newtag

From eafebd8d8e4e1a1d5b65481d92bd153d78eb359d Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 25 Feb 2021 13:59:46 +0100
Subject: [PATCH 032/130] Add edge 5.1 for Docker

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-snapshots | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index aa9e238..2e01381 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -36,3 +36,6 @@ cd /home/builder/website/
 
 # Trigger docker build for edge-5.0
 ./manage.py docker_trigger --tag edge-5.0
+
+# Trigger docker build for edge-5.1
+./manage.py docker_trigger --tag edge-5.1

From be22f29577e35e0e829e4930ece8a54cf3ab7b65 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 25 Feb 2021 14:04:10 +0100
Subject: [PATCH 033/130] Fix typos

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 monitoring/check_phpmyadmin_daily_snapshots.py | 2 +-
 website/generate-missing-checksums             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/monitoring/check_phpmyadmin_daily_snapshots.py b/monitoring/check_phpmyadmin_daily_snapshots.py
index 54fd23b..19d8388 100755
--- a/monitoring/check_phpmyadmin_daily_snapshots.py
+++ b/monitoring/check_phpmyadmin_daily_snapshots.py
@@ -12,7 +12,7 @@
 try:
     from bs4 import BeautifulSoup
 except ModuleNotFoundError:
-    print("The BeautifulSoup modue is not available. Please make sure you have the proper module or are running the correct venv.")
+    print("The BeautifulSoup module is not available. Please make sure you have the proper module or are running the correct venv.")
     raise SystemExit
 import datetime
 
diff --git a/website/generate-missing-checksums b/website/generate-missing-checksums
index d1c27e2..f32da58 100755
--- a/website/generate-missing-checksums
+++ b/website/generate-missing-checksums
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Generates missing checksums for donwload files
+# Generates missing checksums for download files
 
 cd /mnt/storage/files
 

From ae2de6cf73740f6f54abc9102e03a5308e47078a Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 20 Mar 2021 02:36:40 +0100
Subject: [PATCH 034/130] Fix the snapshot build script that was wrong because
 not using the right release script

I found the repository on the server having local changes and not using the right branch

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-snapshots | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index 2e01381..4e6e620 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -12,8 +12,17 @@ git pull -q
 rm -rf release
 
 # Create snapshots
+# Change branch to be sure to have a working release script
+git checkout QA_5_1
+# Destroy any possible local changes
+git reset --hard
 ./scripts/create-release.sh --daily 5.1+snapshot QA_5_1
+git checkout -
+git checkout master
+# Destroy any possible local changes
+git reset --hard
 ./scripts/create-release.sh --daily 5.2+snapshot master
+git checkout -
 
 # Storage directory
 mkdir -p /mnt/storage/files/snapshots/

From 5526b0214465f22d5943f6721dfbdb8a25d0b591 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 23 Mar 2021 02:27:31 +0100
Subject: [PATCH 035/130] Harden daily snapshot process

---
 website/daily-snapshots | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index 4e6e620..9c5f135 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -1,10 +1,13 @@
 #!/bin/sh
 # Script to generate daily snapshots
-set -e
+set -ex
 
 # phpMyAdmin working copy
 cd ~/phpmyadmin
 
+# Delete any local changes
+git reset --hard
+
 # Update to have latest create-release.sh
 git pull -q
 
@@ -16,12 +19,20 @@ rm -rf release
 git checkout QA_5_1
 # Destroy any possible local changes
 git reset --hard
+# Force an update
+git pull --ff-only
 ./scripts/create-release.sh --daily 5.1+snapshot QA_5_1
+# Destroy any possible local changes
+git reset --hard
 git checkout -
 git checkout master
 # Destroy any possible local changes
 git reset --hard
+# Force an update
+git pull --ff-only
 ./scripts/create-release.sh --daily 5.2+snapshot master
+# Destroy any possible local changes
+git reset --hard
 git checkout -
 
 # Storage directory

From 91a5e120dd2fad87988d5c355020f56669e4bd08 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 25 Mar 2021 22:26:21 +0100
Subject: [PATCH 036/130] Use the new CLI to write revision file and write
 routing cache file

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 demo/bin/pma-demo-update | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 2002f1f..8c7a25a 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -56,9 +56,6 @@ for REPONAME in $REPOS ; do
         fi
     fi
 
-    # Store revision info
-    ~/scripts/demo/bin/pma-revision-info
-
     # Create temp dir
     mkdir -p tmp/
     chmod 770 tmp/
@@ -66,6 +63,24 @@ for REPONAME in $REPOS ; do
 
     # Update composer deps
     if [ -f composer.json ] ; then
+
+        # Dev modules are needed to use the CLI
+        composer update --quiet
+
+        if [ -f libraries/cache/routes.cache.php ] ; then
+            rm -f libraries/cache/routes.cache.php
+        fi
+
+        if [ -f ./scripts/console ]; then
+            # Write new routing cache
+            ./scripts/console cache:warmup --routing --no-interaction -v
+            # Write the revision-info.php file
+            # Use the CLI or fallback
+            # TODO: remove fallback when no demo server is below 5.2
+            ./scripts/console write-revision-info --no-interaction -v || ~/scripts/demo/bin/pma-revision-info
+        fi
+
+        # Remove dev vendors
         composer update --quiet --no-dev
     fi
 
@@ -75,10 +90,6 @@ for REPONAME in $REPOS ; do
         yarn install --non-interactive --silent > /dev/null
     fi
 
-    if [ -f libraries/cache/routes.cache.php ] ; then
-        rm -f libraries/cache/routes.cache.php
-    fi
-
     # Link themes
     for THEME in $THEMES ; do
         if [ ! -e themes/$THEME ] ; then

From f343522f86dfb08fc92fbe7e22194fabfc8ae1c3 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Sat, 27 Mar 2021 14:12:30 -0400
Subject: [PATCH 037/130] Fix for occasional build failures due to changes in
 yarn.lock

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 demo/bin/pma-demo-update | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 8c7a25a..616ef04 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -47,6 +47,7 @@ for REPONAME in $REPOS ; do
         # Check for updates
         cd $DIRNAME
         orig_head=$(git log -n 1 --format=format:'%H')
+        git checkout -- yarn.lock
         git pull -q
         new_head=$(git log -n 1 --format=format:'%H')
 

From 44500befd3ab5d270619fc2ff8cd33f84ae4458f Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 28 Mar 2021 03:16:35 +0200
Subject: [PATCH 038/130] Use --frozen-lockfile form Yarn

Ref: https://classic.yarnpkg.com/en/docs/cli/install/#toc-yarn-install-frozen-lockfile

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 demo/bin/pma-demo-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 616ef04..914a719 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -88,7 +88,7 @@ for REPONAME in $REPOS ; do
     if [ -f package.json ] ; then
         # We still redirect output to /dev/null because even with the --silent flag, yarn still gives sass output such as
         # $ sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css
-        yarn install --non-interactive --silent > /dev/null
+        yarn install --frozen-lockfile --non-interactive --silent > /dev/null
     fi
 
     # Link themes

From 42e98ae23110361d5772e69766bcd28d80f467f1 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 28 Mar 2021 03:24:11 +0200
Subject: [PATCH 039/130] Use --frozen-lockfile for Yarn on composer repository
 builds and only push the built tag not all possible tags

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/daily-composer b/website/daily-composer
index 9a00981..74766b4 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -54,7 +54,7 @@ line_counts() {
 }
 
 generate_css() {
-    yarn install --non-interactive --silent --production
+    yarn install --frozen-lockfile --non-interactive --silent --production
     git add --force themes/*/css/*.css || echo "No css file found, not adding to git repository"
     git add --force themes/*/css/*.css.map || echo "No css.map files found, not adding to git repository"
     if ! git diff --quiet --cached ; then
@@ -63,7 +63,7 @@ generate_css() {
 }
 
 generate_js() {
-    yarn install --non-interactive --silent --production
+    yarn install --frozen-lockfile --non-interactive --silent --production
     git add --force js/dist/ || echo "No JS files found, not adding to git repository"
     if ! git diff --quiet --cached ; then
         git commit -m 'Update generated JS files'
@@ -140,6 +140,6 @@ for tag in `git branch -r | grep 'phpmyadmin/tags/RELEASE_[45]_[7890]_[0-9]\+\(_
     git checkout master
     git branch -D tmp
 
-    # Push tags
-    git push --tags origin
+    # Push the tag
+    git push origin $newtag
 done

From 0326b96d13c5d669675c57cc6f90a477e4fbfe95 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 10 Apr 2021 03:26:16 +0200
Subject: [PATCH 040/130] Upgrade Doctum to 5.4

---
 develdocs/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/develdocs/composer.json b/develdocs/composer.json
index 8a25c9a..21dde6d 100644
--- a/develdocs/composer.json
+++ b/develdocs/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "code-lts/doctum": "^5.3"
+        "code-lts/doctum": "^5.4"
     }
 }

From c9edf4ce1114166b4cf964f94c19d8d61aabc72d Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 10 Apr 2021 03:32:35 +0200
Subject: [PATCH 041/130] Add base_url to enable opensearch on documentations

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 develdocs/build.sh   | 1 +
 develdocs/doctum.php | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/develdocs/build.sh b/develdocs/build.sh
index 6e79bae..30328d7 100755
--- a/develdocs/build.sh
+++ b/develdocs/build.sh
@@ -28,6 +28,7 @@ for repo in phpmyadmin sql-parser motranslator shapefile simple-math ; do
     --cache-dir "$BUILDER_REPO/develdocs/tmp/$repo/" \
     --docs-branch "master" \
     --slug "phpmyadmin/$repo" \
+    --base-url "https://develdocs.phpmyadmin.net/$repo/" \
     --output-config "$BUILDER_REPO/develdocs/doctum-$repo.php"
     # Render
     nice -19 "$BUILDER_REPO/develdocs/vendor/bin/doctum.php" update --force --ignore-parse-errors "$BUILDER_REPO/develdocs/doctum-$repo.php"
diff --git a/develdocs/doctum.php b/develdocs/doctum.php
index da2603c..b491cc0 100755
--- a/develdocs/doctum.php
+++ b/develdocs/doctum.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-$_CLI = getopt('', ['slug:', 'root:', 'build-dir:', 'cache-dir:', 'docs-branch:', 'output-config:', 'title::', 'title-of-composer']);
+$_CLI = getopt('', ['slug:', 'root:', 'base-url:', 'build-dir:', 'cache-dir:', 'docs-branch:', 'output-config:', 'title::', 'title-of-composer']);
 
 $SOURCE = 'src';
 
@@ -30,6 +30,7 @@
     'cache_dir'            => '%s',
     'version'              => '%s',
     'remote_repository'    => new GitHubRemoteRepository('%s', '%s'),
+    'base_url'             => '%s',
 ]);
 EOT;
 
@@ -43,7 +44,8 @@
     $_CLI['cache-dir'],
     $_CLI['docs-branch'],
     $_CLI['slug'],
-    $root
+    $root,
+    $_CLI['base-url']
 );
 
 file_put_contents($_CLI['output-config'], $output);

From ea867127bcc3528c63010fd164cb2a7d7edb7133 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Fri, 23 Apr 2021 02:06:50 +0200
Subject: [PATCH 042/130] Install node modules in production mode and delete
 them afterwards to free out space

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 demo/bin/pma-demo-update | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 914a719..fd49616 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -88,7 +88,9 @@ for REPONAME in $REPOS ; do
     if [ -f package.json ] ; then
         # We still redirect output to /dev/null because even with the --silent flag, yarn still gives sass output such as
         # $ sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css
-        yarn install --frozen-lockfile --non-interactive --silent > /dev/null
+        yarn install --production --frozen-lockfile --non-interactive --silent > /dev/null
+        # They waste too much space, clear them out
+        rm -rf ./node_modules
     fi
 
     # Link themes

From 249f5c1cdd0917e31d9280f29e08558129edd42b Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Fri, 23 Apr 2021 02:32:04 +0200
Subject: [PATCH 043/130] Add text logs on the demo server update script and
 cleanup themes before installing them

This is also done to avoid CSS build issues from the previously set-up themes

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 demo/bin/pma-demo-update | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index fd49616..8aca2aa 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -19,6 +19,7 @@ THEMES=`awk '/^themes/ {print $3}' ~/scripts/demo/php/versions.ini`
 for REPONAME in $REPOS ; do
     DIRNAME=$BASEDIR/$REPONAME
     mkdir -p $DIRNAME
+    echo "Working on repository: $REPONAME"
 
     if [ ! -d $DIRNAME/.git ] ; then
         cd $BASEDIR
@@ -53,6 +54,7 @@ for REPONAME in $REPOS ; do
 
         # Check if there has been an update
         if [ $orig_head = $new_head -a "x$1" != "x--force" ] ; then
+            echo "Skipping repository: $REPONAME, no update found"
             continue
         fi
     fi
@@ -85,6 +87,9 @@ for REPONAME in $REPOS ; do
         composer update --quiet --no-dev
     fi
 
+    # Cleanup all themes
+    find ./themes/ -maxdepth 1 -type l -exec unlink {} \;
+
     if [ -f package.json ] ; then
         # We still redirect output to /dev/null because even with the --silent flag, yarn still gives sass output such as
         # $ sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css
@@ -111,6 +116,8 @@ for REPONAME in $REPOS ; do
     fi
 done
 
+echo "Updating themes"
+
 # Clone / update themes
 if [ -d $BASEDIR/themes/.git ] ; then
     cd $BASEDIR/themes
@@ -119,6 +126,8 @@ else
     git clone $REMOTE_THEMES $BASEDIR/themes
 fi
 
+echo "Deleting stale directories"
+
 # Delete stale directories
 find $BASEDIR -maxdepth 1 -mindepth 1 -type d | while read DIRNAME ; do
     REPO=${DIRNAME##*/}
@@ -133,3 +142,5 @@ find $BASEDIR -maxdepth 1 -mindepth 1 -type d | while read DIRNAME ; do
     echo "Deleting stale repository $DIRNAME"
     rm -rf "$DIRNAME"
 done
+
+echo "All done"

From 115b847b23a4d8b4b99cb5140d24655d13ff0bcd Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Fri, 23 Apr 2021 10:58:46 +0200
Subject: [PATCH 044/130] Add a quiet mode "-q" to pma update demo script

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 demo/bin/pma-demo-update | 55 +++++++++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 8aca2aa..567c8f1 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -1,9 +1,45 @@
-#!/bin/sh
+#!/bin/bash
+
 # Script to update repositories for the demo server
 # Requires ~/scripts to be checkout of scripts repository
 
 set -e
 
+FORCE_MODE="0"
+QUIET_MODE="0"
+
+# Source: https://stackoverflow.com/a/31024664/5155484
+while [[ $# > 0 ]]
+do
+    key="$1"
+    while [[ ${key+x} ]]
+    do
+        case $key in
+            --force)
+                FORCE_MODE="1"
+                ;;
+            -q)
+                QUIET_MODE="1"
+                ;;
+            *)
+                # unknown option
+                echo "Unknown option: $key" #1>&2
+                exit 10
+                ;;
+        esac
+        # prepare for next option in this key, if any
+        [[ "$key" = -? || "$key" == --* ]] && unset key || key="${key/#-?/-}"
+    done
+    shift # option(s) fully processed, proceed to next input argument
+done
+
+debugLog() {
+    if [ "${QUIET_MODE}" = "1" ]; then
+        return
+    fi
+    echo "$1"
+}
+
 # Directory where repositories are stored
 BASEDIR=~/.pma-demo
 
@@ -19,7 +55,7 @@ THEMES=`awk '/^themes/ {print $3}' ~/scripts/demo/php/versions.ini`
 for REPONAME in $REPOS ; do
     DIRNAME=$BASEDIR/$REPONAME
     mkdir -p $DIRNAME
-    echo "Working on repository: $REPONAME"
+    debugLog "Working on repository: $REPONAME"
 
     if [ ! -d $DIRNAME/.git ] ; then
         cd $BASEDIR
@@ -53,8 +89,8 @@ for REPONAME in $REPOS ; do
         new_head=$(git log -n 1 --format=format:'%H')
 
         # Check if there has been an update
-        if [ $orig_head = $new_head -a "x$1" != "x--force" ] ; then
-            echo "Skipping repository: $REPONAME, no update found"
+        if [ $orig_head = $new_head -a "${FORCE_MODE}" = "0" ] ; then
+            debugLog "Skipping repository: $REPONAME, no update found"
             continue
         fi
     fi
@@ -66,7 +102,7 @@ for REPONAME in $REPOS ; do
 
     # Update composer deps
     if [ -f composer.json ] ; then
-
+        debugLog "Managing php dependencies"
         # Dev modules are needed to use the CLI
         composer update --quiet
 
@@ -91,6 +127,7 @@ for REPONAME in $REPOS ; do
     find ./themes/ -maxdepth 1 -type l -exec unlink {} \;
 
     if [ -f package.json ] ; then
+        debugLog "Managing JS dependencies"
         # We still redirect output to /dev/null because even with the --silent flag, yarn still gives sass output such as
         # $ sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css
         yarn install --production --frozen-lockfile --non-interactive --silent > /dev/null
@@ -116,7 +153,7 @@ for REPONAME in $REPOS ; do
     fi
 done
 
-echo "Updating themes"
+debugLog "Updating themes"
 
 # Clone / update themes
 if [ -d $BASEDIR/themes/.git ] ; then
@@ -126,7 +163,7 @@ else
     git clone $REMOTE_THEMES $BASEDIR/themes
 fi
 
-echo "Deleting stale directories"
+debugLog "Deleting stale directories"
 
 # Delete stale directories
 find $BASEDIR -maxdepth 1 -mindepth 1 -type d | while read DIRNAME ; do
@@ -139,8 +176,8 @@ find $BASEDIR -maxdepth 1 -mindepth 1 -type d | while read DIRNAME ; do
             continue 2
         fi
     done
-    echo "Deleting stale repository $DIRNAME"
+    debugLog "Deleting stale repository $DIRNAME"
     rm -rf "$DIRNAME"
 done
 
-echo "All done"
+debugLog "All done"

From 8f268d50ec9eb1fc3c9fa520e9b715a7c43cb545 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 27 Apr 2021 02:21:03 +0200
Subject: [PATCH 045/130] Make the update demo script totally silent when -q
 asks for it

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 demo/bin/pma-demo-update | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 567c8f1..4802013 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -40,6 +40,15 @@ debugLog() {
     echo "$1"
 }
 
+fetchReleaseSeriesFromFile() {
+    # version<5.1 do not have the file
+    if [ ! -f libraries/classes/Version.php ]; then
+        echo "old";
+        return;
+    fi
+    php -r "define('VERSION_SUFFIX', ''); require_once('libraries/classes/Version.php'); echo \PhpMyAdmin\Version::SERIES;"
+}
+
 # Directory where repositories are stored
 BASEDIR=~/.pma-demo
 
@@ -111,12 +120,22 @@ for REPONAME in $REPOS ; do
         fi
 
         if [ -f ./scripts/console ]; then
+            CLI_VERBOSE="-v"
+            if [ "${QUIET_MODE}" = "1" ]; then
+                CLI_VERBOSE="-q"
+            fi
             # Write new routing cache
-            ./scripts/console cache:warmup --routing --no-interaction -v
+            ./scripts/console cache:warmup --routing --no-interaction ${CLI_VERBOSE}
             # Write the revision-info.php file
             # Use the CLI or fallback
             # TODO: remove fallback when no demo server is below 5.2
-            ./scripts/console write-revision-info --no-interaction -v || ~/scripts/demo/bin/pma-revision-info
+            if [ "$(fetchReleaseSeriesFromFile)" = "5.1" ] || [ "$(fetchReleaseSeriesFromFile)" = "old" ]; then
+                debugLog "Using the old revision script"
+                ~/scripts/demo/bin/pma-revision-info
+            else
+                debugLog "Using the new revision script"
+                ./scripts/console write-revision-info --no-interaction ${CLI_VERBOSE}
+            fi
         fi
 
         # Remove dev vendors
@@ -130,7 +149,8 @@ for REPONAME in $REPOS ; do
         debugLog "Managing JS dependencies"
         # We still redirect output to /dev/null because even with the --silent flag, yarn still gives sass output such as
         # $ sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css
-        yarn install --production --frozen-lockfile --non-interactive --silent > /dev/null
+        # Use a subshell method to absorb all the output because "Browserslist: caniuse-lite is outdated." misbehaves
+        (yarn install --production --frozen-lockfile --non-interactive --silent) >/dev/null 2>&1
         # They waste too much space, clear them out
         rm -rf ./node_modules
     fi

From a0027ea87dee140467a14962a487b77f94052ceb Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 5 May 2021 00:12:53 +0200
Subject: [PATCH 046/130] Stop processing 4.7 and 4.8 on daily composer

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index 74766b4..49c5dee 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -12,7 +12,7 @@ set -u
 DIR=~/composer
 
 # Branches we process
-BRANCHES="QA_5_1 QA_5_0 QA_4_9 QA_4_8 QA_4_7 master"
+BRANCHES="QA_5_1 QA_5_0 QA_4_9 master"
 
 generate_readme() {
     cat > README.rst <<EOT

From ed6f32f8fbbc15890ed3fd7a230fca3a86b20055 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 5 May 2021 00:18:12 +0200
Subject: [PATCH 047/130] Add more cleaning and safe guards on the composer git
 process Signed-off-by: William Desportes <williamdes@wdes.fr>

---
 website/daily-composer | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/website/daily-composer b/website/daily-composer
index 49c5dee..405fa96 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -84,6 +84,9 @@ git remote update phpmyadmin
 # Fetch tags (we don't want them as tags)
 git fetch phpmyadmin '+refs/tags/*:refs/remotes/phpmyadmin/tags/*'
 
+# Destroy local changes
+git reset --hard
+
 # Process branches
 for branch in $BRANCHES ; do
     if [ $branch = master ] ; then
@@ -104,6 +107,11 @@ for branch in $BRANCHES ; do
         git checkout -b $newbranch phpmyadmin/$branch
     fi
 
+    # Destroy any possible changes
+    git reset --hard
+    # Force an update just in case
+    git pull --ff
+
     # Update content
     generate_readme
     generate_mo

From 3ec530224dacf7a64af944759e93547437bf81a7 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 6 May 2021 00:26:49 +0200
Subject: [PATCH 048/130] Remove progress bar from Doctum build output for
 crons not to send the output by email Signed-off-by: William Desportes
 <williamdes@wdes.fr>

---
 develdocs/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/develdocs/build.sh b/develdocs/build.sh
index 30328d7..1281e62 100755
--- a/develdocs/build.sh
+++ b/develdocs/build.sh
@@ -31,7 +31,7 @@ for repo in phpmyadmin sql-parser motranslator shapefile simple-math ; do
     --base-url "https://develdocs.phpmyadmin.net/$repo/" \
     --output-config "$BUILDER_REPO/develdocs/doctum-$repo.php"
     # Render
-    nice -19 "$BUILDER_REPO/develdocs/vendor/bin/doctum.php" update --force --ignore-parse-errors "$BUILDER_REPO/develdocs/doctum-$repo.php"
+    nice -19 "$BUILDER_REPO/develdocs/vendor/bin/doctum.php" update --force --no-progress --no-ansi --ignore-parse-errors "$BUILDER_REPO/develdocs/doctum-$repo.php"
     # Delete config file
     rm "$BUILDER_REPO/develdocs/doctum-$repo.php"
 done

From c6b06fee17a8901c55dae993eb63a2a969e876ef Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 13 May 2021 15:16:02 +0200
Subject: [PATCH 049/130] Add Sentry setup Signed-off-by: William Desportes
 <williamdes@wdes.fr>

---
 infrastructure/.gitignore                |  2 +
 infrastructure/sentry/.env.dist          |  6 ++
 infrastructure/sentry/README.md          | 25 ++++++++
 infrastructure/sentry/docker-compose.yml | 73 ++++++++++++++++++++++++
 infrastructure/sentry/dockerl            |  3 +
 5 files changed, 109 insertions(+)
 create mode 100644 infrastructure/.gitignore
 create mode 100644 infrastructure/sentry/.env.dist
 create mode 100644 infrastructure/sentry/README.md
 create mode 100644 infrastructure/sentry/docker-compose.yml
 create mode 100755 infrastructure/sentry/dockerl

diff --git a/infrastructure/.gitignore b/infrastructure/.gitignore
new file mode 100644
index 0000000..a76642c
--- /dev/null
+++ b/infrastructure/.gitignore
@@ -0,0 +1,2 @@
+.env*
+!.env.dist
diff --git a/infrastructure/sentry/.env.dist b/infrastructure/sentry/.env.dist
new file mode 100644
index 0000000..8aa1fc9
--- /dev/null
+++ b/infrastructure/sentry/.env.dist
@@ -0,0 +1,6 @@
+SENTRY_SECRET_KEY=
+POSTGRES_PASSWORD=
+
+POSTGRES_DATA_VOLUME=
+SENTRY_DATA_VOLUME=
+
diff --git a/infrastructure/sentry/README.md b/infrastructure/sentry/README.md
new file mode 100644
index 0000000..a7d60ab
--- /dev/null
+++ b/infrastructure/sentry/README.md
@@ -0,0 +1,25 @@
+# phpMyAdmin Sentry instance
+
+## Required
+
+- `docker`
+- `docker-compose`
+
+## Initialization
+
+Copy `.env.dist` to `.env.`, fill the values.
+
+Run `./dockerl exec sentry sentry upgrade` to apply the migrations.
+
+The CLI will ask if you want to create an user, say "Y" and fill the email and password.
+
+Run `./dockerl exec sentry pip install sentry-slack` to install the Sentry Slack integration.
+Run `./dockerl exec sentry pip install sentry-github` to install the Sentry GitHub integration.
+
+Login into http://localhost:9000/ or something similar.
+
+## Start it
+
+Run `./dockerl up` or `./dockerl up -d` for detached mode.
+
+This command is a shortcut to docker compose with the right project name.
diff --git a/infrastructure/sentry/docker-compose.yml b/infrastructure/sentry/docker-compose.yml
new file mode 100644
index 0000000..e7a5b02
--- /dev/null
+++ b/infrastructure/sentry/docker-compose.yml
@@ -0,0 +1,73 @@
+version: '2.3'
+
+services:
+  redis:
+    restart: on-failure:5
+    image: redis:6.0-alpine
+    healthcheck:
+        test: ["CMD", "redis-cli", "ping"]
+        interval: 1s
+        timeout: 3s
+        retries: 30
+
+  postgres:
+    restart: on-failure:5
+    image: postgres:13-alpine
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U sentry"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+    environment:
+      POSTGRES_USER: sentry
+      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
+      POSTGRES_DB: sentry
+    volumes:
+     - ${POSTGRES_DATA_VOLUME}:/var/lib/postgresql/data
+
+  sentry:
+    image: sentry:9.1.2
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    ports:
+     - 9000:9000
+    environment:
+      SENTRY_SECRET_KEY: "${SENTRY_SECRET_KEY}"
+      SENTRY_POSTGRES_HOST: postgres
+      SENTRY_DB_USER: sentry
+      SENTRY_DB_PASSWORD: "${POSTGRES_PASSWORD}"
+      SENTRY_REDIS_HOST: redis
+
+  cron:
+    image: sentry:9.1.2
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    command: "sentry run cron"
+    environment:
+      SENTRY_SECRET_KEY: "${SENTRY_SECRET_KEY}"
+      SENTRY_POSTGRES_HOST: postgres
+      SENTRY_DB_USER: sentry
+      SENTRY_DB_PASSWORD: "${POSTGRES_PASSWORD}"
+      SENTRY_REDIS_HOST: redis
+
+  worker:
+    image: sentry:9.1.2
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    command: "sentry run worker"
+    environment:
+      SENTRY_SECRET_KEY: "${SENTRY_SECRET_KEY}"
+      SENTRY_POSTGRES_HOST: postgres
+      SENTRY_DB_USER: sentry
+      SENTRY_DB_PASSWORD: "${POSTGRES_PASSWORD}"
+      SENTRY_REDIS_HOST: redis
\ No newline at end of file
diff --git a/infrastructure/sentry/dockerl b/infrastructure/sentry/dockerl
new file mode 100755
index 0000000..5d5b951
--- /dev/null
+++ b/infrastructure/sentry/dockerl
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker-compose -p phpmyadmin-sentry $@

From 246bd5a307c5c30a71f7adc8cef514a8be5b19be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Thu, 20 May 2021 11:41:25 -0300
Subject: [PATCH 050/130] Add codind-standard and scripts repos to
 phpmyadmin-reports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 phpmyadmin-reports | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpmyadmin-reports b/phpmyadmin-reports
index 017be56..20ea8b8 100755
--- a/phpmyadmin-reports
+++ b/phpmyadmin-reports
@@ -44,6 +44,8 @@ PROJECTS = (
     'phpmyadmin/localized_docs',
     'phpmyadmin/error-reporting-server',
     'phpmyadmin/twig-i18n-extension',
+    'phpmyadmin/coding-standard',
+    'phpmyadmin/scripts',
 )
 # Only include commits not present elsewhere from this repository
 PROJECT_EXTRA_COMMITS = (

From fe624dee5553980e695c8e957723c115023a1ccf Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 29 May 2021 22:43:51 +0200
Subject: [PATCH 051/130] Fix Sentry volume and add email config

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 infrastructure/sentry/.env.dist          |  1 +
 infrastructure/sentry/docker-compose.yml | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/infrastructure/sentry/.env.dist b/infrastructure/sentry/.env.dist
index 8aa1fc9..37c4016 100644
--- a/infrastructure/sentry/.env.dist
+++ b/infrastructure/sentry/.env.dist
@@ -4,3 +4,4 @@ POSTGRES_PASSWORD=
 POSTGRES_DATA_VOLUME=
 SENTRY_DATA_VOLUME=
 
+SENTRY_SERVER_EMAIL=
diff --git a/infrastructure/sentry/docker-compose.yml b/infrastructure/sentry/docker-compose.yml
index e7a5b02..c012aaf 100644
--- a/infrastructure/sentry/docker-compose.yml
+++ b/infrastructure/sentry/docker-compose.yml
@@ -25,6 +25,9 @@ services:
       POSTGRES_DB: sentry
     volumes:
      - ${POSTGRES_DATA_VOLUME}:/var/lib/postgresql/data
+  smtp:
+    restart: unless-stopped
+    image: tianon/exim4
 
   sentry:
     image: sentry:9.1.2
@@ -41,6 +44,11 @@ services:
       SENTRY_DB_USER: sentry
       SENTRY_DB_PASSWORD: "${POSTGRES_PASSWORD}"
       SENTRY_REDIS_HOST: redis
+      SENTRY_FILESTORE_DIR: /data/filestorage
+      SENTRY_SERVER_EMAIL: "${SENTRY_SERVER_EMAIL}"
+      SENTRY_EMAIL_HOST: smtp
+    volumes:
+     - ${SENTRY_DATA_VOLUME}:/data
 
   cron:
     image: sentry:9.1.2
@@ -56,6 +64,11 @@ services:
       SENTRY_DB_USER: sentry
       SENTRY_DB_PASSWORD: "${POSTGRES_PASSWORD}"
       SENTRY_REDIS_HOST: redis
+      SENTRY_FILESTORE_DIR: /data/filestorage
+      SENTRY_SERVER_EMAIL: "${SENTRY_SERVER_EMAIL}"
+      SENTRY_EMAIL_HOST: smtp
+    volumes:
+     - ${SENTRY_DATA_VOLUME}:/data
 
   worker:
     image: sentry:9.1.2
@@ -70,4 +83,9 @@ services:
       SENTRY_POSTGRES_HOST: postgres
       SENTRY_DB_USER: sentry
       SENTRY_DB_PASSWORD: "${POSTGRES_PASSWORD}"
-      SENTRY_REDIS_HOST: redis
\ No newline at end of file
+      SENTRY_REDIS_HOST: redis
+      SENTRY_FILESTORE_DIR: /data/filestorage
+      SENTRY_SERVER_EMAIL: "${SENTRY_SERVER_EMAIL}"
+      SENTRY_EMAIL_HOST: smtp
+    volumes:
+     - ${SENTRY_DATA_VOLUME}:/data

From 3259c15d779a66a6796c8d692316639230a05060 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 5 Jun 2021 01:00:31 +0200
Subject: [PATCH 052/130] Remove yarn --production flag to fix "[BABEL]: Cannot
 find module 'browserslist'"

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/website/daily-composer b/website/daily-composer
index 405fa96..5d82f8c 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -54,7 +54,8 @@ line_counts() {
 }
 
 generate_css() {
-    yarn install --frozen-lockfile --non-interactive --silent --production
+    # You can not use --production because it creates the error "[BABEL]: Cannot find module 'browserslist'"
+    yarn install --frozen-lockfile --non-interactive --silent
     git add --force themes/*/css/*.css || echo "No css file found, not adding to git repository"
     git add --force themes/*/css/*.css.map || echo "No css.map files found, not adding to git repository"
     if ! git diff --quiet --cached ; then
@@ -63,7 +64,8 @@ generate_css() {
 }
 
 generate_js() {
-    yarn install --frozen-lockfile --non-interactive --silent --production
+    # You can not use --production because it creates the error "[BABEL]: Cannot find module 'browserslist'"
+    yarn install --frozen-lockfile --non-interactive --silent
     git add --force js/dist/ || echo "No JS files found, not adding to git repository"
     if ! git diff --quiet --cached ; then
         git commit -m 'Update generated JS files'

From dde539fdbd12b029aace1f3a173e4bc5fadd7642 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 5 Jun 2021 01:01:15 +0200
Subject: [PATCH 053/130] Fix tag regex to only allow 5.x.x releases and remove
 support for release format x.x.x.x

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index 5d82f8c..a51a677 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -126,7 +126,7 @@ for branch in $BRANCHES ; do
 done
 
 # Process tags
-for tag in `git branch -r | grep 'phpmyadmin/tags/RELEASE_[45]_[7890]_[0-9]\+\(_[0-9]\)\?$'` ; do
+for tag in `git branch -r | grep 'phpmyadmin/tags/RELEASE_[5]_[0-9]{1,3}_[0-9]{1,2}$'` ; do
     newtag=`echo $tag | sed -e 's@.*RELEASE_@@' -e 's/_/./g'`
     if git rev-parse --verify --quiet $newtag ; then
         continue

From ff1d0a107ea8f57ab0d6732cf42a280285bab0e7 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 17 Jun 2021 15:19:06 +0200
Subject: [PATCH 054/130] Add a security reset for changed source files on the
 composer version

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/website/daily-composer b/website/daily-composer
index a51a677..2c0067d 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -72,6 +72,26 @@ generate_js() {
     fi
 }
 
+reset_not_allowed_to_change_source_files() {
+    # Source: https://stackoverflow.com/a/68019875/5155484
+    CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map')"
+
+    if [ -z "$CHANGED_FILES" ]; then
+        echo "No files did change"
+        return
+    fi
+
+    echo "Files changed: $CHANGED_FILES"
+
+    echo "$CHANGED_FILES" | xargs git checkout phpmyadmin/$branch --theirs
+    echo "$CHANGED_FILES" | xargs git add --force
+    unset CHANGED_FILES
+
+    if ! git diff --quiet --cached ; then
+        git commit -m 'Reset changed source files'
+    fi
+}
+
 # Ensure we have working dir
 if [ ! -d "$DIR" ] ; then
     git clone git@github.com:phpmyadmin/composer.git "$DIR"
@@ -114,6 +134,9 @@ for branch in $BRANCHES ; do
     # Force an update just in case
     git pull --ff
 
+    # Reset content that could have changed by mistake
+    reset_not_allowed_to_change_source_files
+
     # Update content
     generate_readme
     generate_mo

From b19c8f1413386620ae55842f3c66e66f95a527a7 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 3 Aug 2021 19:45:56 +0200
Subject: [PATCH 055/130] Add a hostname to the exim4 container to have a
 correct SMTP helo value

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 infrastructure/sentry/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/infrastructure/sentry/docker-compose.yml b/infrastructure/sentry/docker-compose.yml
index c012aaf..cfa2e0b 100644
--- a/infrastructure/sentry/docker-compose.yml
+++ b/infrastructure/sentry/docker-compose.yml
@@ -27,6 +27,8 @@ services:
      - ${POSTGRES_DATA_VOLUME}:/var/lib/postgresql/data
   smtp:
     restart: unless-stopped
+    # Use this value to have correct SMTP HELO value
+    hostname: hertz.phpmyadmin.net
     image: tianon/exim4
 
   sentry:

From fc4daf653ae6d966f3386ea776478cb42e70b821 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 30 Aug 2021 02:50:59 +0200
Subject: [PATCH 056/130] Drop docker edge tags support

Fixes: #42
---
 monitoring/check_phpmyadmin_docker.sh | 9 ++++-----
 website/daily-snapshots               | 9 ---------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/monitoring/check_phpmyadmin_docker.sh b/monitoring/check_phpmyadmin_docker.sh
index 90b9951..8920bc3 100755
--- a/monitoring/check_phpmyadmin_docker.sh
+++ b/monitoring/check_phpmyadmin_docker.sh
@@ -3,10 +3,9 @@
 # This script will get a list of currently supported versions from phpmyadmin.net.
 # For each version, it pulls the Docker image for each flavor, including major and minor
 # version shortcuts (5, 5.0, and 5.0.0). We check that the expected version is listed in ChangeLog.
-# 
-# This does not currently test 'edge' development versions.
+#
 # Future versions could use jq to parse package.json for the "version" field
-# 
+#
 # Written by Isaac Bennetch <bennetch@gmail.com>
 
 supported_versions=$(curl -fsSL 'https://www.phpmyadmin.net/home_page/version.json'|jq -r '.releases|.[]|.version')
@@ -14,11 +13,11 @@ supported_versions=$(curl -fsSL 'https://www.phpmyadmin.net/home_page/version.js
 if [ "$1" == "-h" ] || [ "$1" == "--help" ]
 then
   echo "Checks whether the docker builds are current to the versions presented in the version.json file from phpmyadmin.net"
-  echo 
+  echo ""
   echo "Possible arguments:"
   echo "  -v --verbose    Prints some progress output (usually runs silently)"
   echo "  -h --help       Prints this help message"
-  exit
+  exit ""
 fi
 
 if [ "$1" == "-v" ] || [ "$1" == "--verbose" ]
diff --git a/website/daily-snapshots b/website/daily-snapshots
index 9c5f135..467e4b5 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -50,12 +50,3 @@ rsync -va /mnt/storage/files/ cdn:/www/
 # trigger website scan
 cd /home/builder/website/
 ./manage.py import_files
-
-# Trigger docker build for edge-4.9
-./manage.py docker_trigger --tag edge-4.9
-
-# Trigger docker build for edge-5.0
-./manage.py docker_trigger --tag edge-5.0
-
-# Trigger docker build for edge-5.1
-./manage.py docker_trigger --tag edge-5.1

From d248dfa2e0fe1cac27cbac2685dc6ce0b6e0e3a2 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 9 Jan 2022 23:16:24 +0100
Subject: [PATCH 057/130] Upgrade to Doctum 5.5

---
 develdocs/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/develdocs/composer.json b/develdocs/composer.json
index 21dde6d..d283320 100644
--- a/develdocs/composer.json
+++ b/develdocs/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "code-lts/doctum": "^5.4"
+        "code-lts/doctum": "^5.5"
     }
 }

From a5636204a44af6ee641a965617609788c4653cda Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Sat, 22 Jan 2022 08:42:39 -0500
Subject: [PATCH 058/130] Improve handling of older phpMyAdmin versions that
 don't get Composer releases

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 website/daily-composer | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index 2c0067d..4eeda49 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -149,7 +149,11 @@ for branch in $BRANCHES ; do
 done
 
 # Process tags
-for tag in `git branch -r | grep 'phpmyadmin/tags/RELEASE_[5]_[0-9]{1,3}_[0-9]{1,2}$'` ; do
+
+# We don't take tags prior to 4.7.0, since that's when we started distributing through Composer.
+# This grep string matches 4.7-9 or anything higher than 5.
+# We also do not match on any release candidate or development release.
+for tag in `git branch -r | grep 'phpmyadmin/tags/\(RELEASE_[4]_[7-9]_[0-9]\+\(_[0-9]\)\?$\)\|\(RELEASE_\([^1-4]\|[0-9]\{2,\}\)\_[0-9]\+_[0-9]\+\(_[0-9]\)\?$\)` ; do
     newtag=`echo $tag | sed -e 's@.*RELEASE_@@' -e 's/_/./g'`
     if git rev-parse --verify --quiet $newtag ; then
         continue

From ad548daded3844131a34aeba5e1be361e8720669 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Sat, 22 Jan 2022 08:44:05 -0500
Subject: [PATCH 059/130] Advertise QA_5_2 on demo server, bump master to
 5.3.0-dev

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 demo/php/versions.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index a9ec7ee..6c8cc22 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -13,9 +13,10 @@ branches[] = master-config-nopmadb
 branches[] = STABLE
 branches[] = QA_4_9
 branches[] = QA_5_1
+branches[] = QA_5_2
 
 # Version of future release from master branch
-master-release = 5.2.0
+master-release = 5.3.0
 
 # List of themes to link
 themes[] = metro

From 5011234e1c8a0877ca03417dd347c6fb6f4950d8 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Wed, 9 Feb 2022 10:44:09 -0500
Subject: [PATCH 060/130] Fixes for which tags we process.

Handles versions greater than 4.7.0 (when we started distributing through Composer)

Fixes an unterminated quote from a5636204a44af6ee641a965617609788c4653cda

Fixes/replaces unescaped braces from dde539fdbd12b029aace1f3a173e4bc5fadd7642. While that commit is simpler, this builds version 4 since we still offer security support for 4.9.x. We can re-implement that commit once 4.9.x support is officially removed.

Related to #45
Related to https://github.com/phpmyadmin/phpmyadmin/issues/17349

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 website/daily-composer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index 4eeda49..ba2bad0 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -153,7 +153,7 @@ done
 # We don't take tags prior to 4.7.0, since that's when we started distributing through Composer.
 # This grep string matches 4.7-9 or anything higher than 5.
 # We also do not match on any release candidate or development release.
-for tag in `git branch -r | grep 'phpmyadmin/tags/\(RELEASE_[4]_[7-9]_[0-9]\+\(_[0-9]\)\?$\)\|\(RELEASE_\([^1-4]\|[0-9]\{2,\}\)\_[0-9]\+_[0-9]\+\(_[0-9]\)\?$\)` ; do
+for tag in $(git branch -r | grep 'phpmyadmin/tags/\(RELEASE_[4]_[7-9]_[0-9]\+\(_[0-9]\)\?$\)\|\(RELEASE_\([^1-4]\|[0-9]\{2,\}\)\_[0-9]\+_[0-9]\+\(_[0-9]\)\?$\)') ; do
     newtag=`echo $tag | sed -e 's@.*RELEASE_@@' -e 's/_/./g'`
     if git rev-parse --verify --quiet $newtag ; then
         continue

From be945ac05ef763a56b7004acc2438041663ec5eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Thu, 10 Feb 2022 18:46:58 -0300
Subject: [PATCH 061/130] Update daily snapshot list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The master branch is now 5.3.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 website/daily-snapshots | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index 467e4b5..cefe2ec 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -25,15 +25,21 @@ git pull --ff-only
 # Destroy any possible local changes
 git reset --hard
 git checkout -
-git checkout master
+git checkout QA_5_2
 # Destroy any possible local changes
 git reset --hard
 # Force an update
 git pull --ff-only
-./scripts/create-release.sh --daily 5.2+snapshot master
+./scripts/create-release.sh --daily 5.2+snapshot QA_5_2
 # Destroy any possible local changes
 git reset --hard
 git checkout -
+git checkout master
+# Destroy any possible local changes
+git reset --hard
+# Force an update
+git pull --ff-only
+./scripts/create-release.sh --daily 5.3+snapshot master
 
 # Storage directory
 mkdir -p /mnt/storage/files/snapshots/

From 30c8b4211d7ecb21fdb6607cc701e9f2af881ff5 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 15 Mar 2022 00:25:07 +0100
Subject: [PATCH 062/130] Also ignore JS map files from changed files on daily
 composer

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index ba2bad0..b4bf91e 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -74,7 +74,7 @@ generate_js() {
 
 reset_not_allowed_to_change_source_files() {
     # Source: https://stackoverflow.com/a/68019875/5155484
-    CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map')"
+    CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!js/dist/*.js.map' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map')"
 
     if [ -z "$CHANGED_FILES" ]; then
         echo "No files did change"

From 3fca1db49bf3f3378ca04083ba3ab293dca3acb5 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Wed, 11 May 2022 09:43:07 -0400
Subject: [PATCH 063/130] Stop demo of QA_5_1 which is discontinued

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 demo/php/versions.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index 6c8cc22..b14fa9c 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -12,7 +12,6 @@ branches[] = master-http
 branches[] = master-config-nopmadb
 branches[] = STABLE
 branches[] = QA_4_9
-branches[] = QA_5_1
 branches[] = QA_5_2
 
 # Version of future release from master branch

From 5b4b9cabe9063c775b46fd2105bd621f5a8e0903 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Wed, 11 May 2022 09:54:33 -0400
Subject: [PATCH 064/130] No longer build daily snapshot for QA_5_1

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 website/daily-snapshots | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index cefe2ec..68e01bd 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -16,15 +16,6 @@ rm -rf release
 
 # Create snapshots
 # Change branch to be sure to have a working release script
-git checkout QA_5_1
-# Destroy any possible local changes
-git reset --hard
-# Force an update
-git pull --ff-only
-./scripts/create-release.sh --daily 5.1+snapshot QA_5_1
-# Destroy any possible local changes
-git reset --hard
-git checkout -
 git checkout QA_5_2
 # Destroy any possible local changes
 git reset --hard

From 3124627e45a03e173490001f96781d853b01e943 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 11 Jun 2022 14:52:17 +0200
Subject: [PATCH 065/130] Remove line counts in daily composer script since it
 was removed in 4.8

Ref: https://github.com/phpmyadmin/phpmyadmin/commit/8ef504da912d95e683217228f589bd6d90500384

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/website/daily-composer b/website/daily-composer
index b4bf91e..d61c3e1 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -42,17 +42,6 @@ generate_mo() {
     fi
 }
 
-line_counts() {
-    if [ ! -x ./scripts/line-counts.sh ] ; then
-        return
-    fi
-    ./scripts/line-counts.sh
-    git add -f js/line_counts.php
-    if ! git diff --quiet --cached ; then
-        git commit -m 'Updated line counts' js/line_counts.php
-    fi
-}
-
 generate_css() {
     # You can not use --production because it creates the error "[BABEL]: Cannot find module 'browserslist'"
     yarn install --frozen-lockfile --non-interactive --silent
@@ -140,7 +129,6 @@ for branch in $BRANCHES ; do
     # Update content
     generate_readme
     generate_mo
-    line_counts
     generate_css
     generate_js
 
@@ -166,7 +154,6 @@ for tag in $(git branch -r | grep 'phpmyadmin/tags/\(RELEASE_[4]_[7-9]_[0-9]\+\(
     # Update content
     generate_readme
     generate_mo
-    line_counts
     generate_css
     generate_js
 

From b6ba75f6953a4f3180309b1693bc4acbaf768315 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 11 Jun 2022 14:59:47 +0200
Subject: [PATCH 066/130] Force setting the phpMyAdmin version in composer
 distributed versions

Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/17570
Ref: https://github.com/Roave/SecurityAdvisories/issues/76

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/website/daily-composer b/website/daily-composer
index d61c3e1..f1468e1 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -61,6 +61,26 @@ generate_js() {
     fi
 }
 
+# Keep in sync with phpmyadmin/phpmyadmin:scripts/create-release.sh
+fetchReleaseFromFile() {
+    php -r "define('VERSION_SUFFIX', ''); require_once('libraries/classes/Version.php'); echo \PhpMyAdmin\Version::VERSION;"
+}
+
+set_version_in_composer() {
+    if [ ! -f libraries/classes/Version.php ]; then
+        echo "The version file does not exist for this version"
+        return
+    fi
+
+    # The reason the version is added to the composer.json file is because of:
+    # - https://github.com/phpmyadmin/phpmyadmin/issues/17570
+    # - https://github.com/Roave/SecurityAdvisories/issues/76
+
+    echo "Detected version: $(fetchReleaseFromFile)"
+    composer config version "$(fetchReleaseFromFile)"
+    echo "Saved version: $(composer config version)"
+}
+
 reset_not_allowed_to_change_source_files() {
     # Source: https://stackoverflow.com/a/68019875/5155484
     CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!js/dist/*.js.map' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map')"
@@ -131,6 +151,7 @@ for branch in $BRANCHES ; do
     generate_mo
     generate_css
     generate_js
+    set_version_in_composer
 
     # Push
     git push origin $newbranch
@@ -156,6 +177,7 @@ for tag in $(git branch -r | grep 'phpmyadmin/tags/\(RELEASE_[4]_[7-9]_[0-9]\+\(
     generate_mo
     generate_css
     generate_js
+    set_version_in_composer
 
     # Create tag
     git tag -a -m "Composer tag for $tag" $newtag

From d60dc9283c3ec8b35fc6c4432cf6bd37a3bbbc26 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 11 Jun 2022 15:09:43 +0200
Subject: [PATCH 067/130] Commit the changes made to composer.json in composer
 versions

Ref: https://github.com/phpmyadmin/phpmyadmin/issues/17570
Ref: https://github.com/Roave/SecurityAdvisories/issues/76

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/website/daily-composer b/website/daily-composer
index f1468e1..049f1c8 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -79,6 +79,10 @@ set_version_in_composer() {
     echo "Detected version: $(fetchReleaseFromFile)"
     composer config version "$(fetchReleaseFromFile)"
     echo "Saved version: $(composer config version)"
+    git add composer.json
+    if ! git diff --quiet --cached ; then
+        git commit -m 'Set version in composer.json' -m "Version: $(composer config version)"
+    fi
 }
 
 reset_not_allowed_to_change_source_files() {

From 7cee2606fd5226d4d0bb7a3e3f0fc61f2dd40439 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 11 Jun 2022 23:28:46 +0200
Subject: [PATCH 068/130] Add QA_5_2 on daily composer versions

Adding closes from here

Closes: https://github.com/phpmyadmin/composer/pull/10
Closes: https://github.com/phpmyadmin/composer/pull/8

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-composer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index 049f1c8..7440d82 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -12,7 +12,7 @@ set -u
 DIR=~/composer
 
 # Branches we process
-BRANCHES="QA_5_1 QA_5_0 QA_4_9 master"
+BRANCHES="QA_5_2 QA_5_1 QA_5_0 QA_4_9 master"
 
 generate_readme() {
     cat > README.rst <<EOT

From 53fd3f80b0c602ef9540c19e149604c997efa46b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Wed, 14 Sep 2022 09:39:23 -0300
Subject: [PATCH 069/130] Update blowfish_secret of demo servers to be 32 bytes
 long
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to https://github.com/phpmyadmin/phpmyadmin/issues/17369

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 demo/php/config-common.inc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/demo/php/config-common.inc.php b/demo/php/config-common.inc.php
index e7a9e83..a1c0a20 100644
--- a/demo/php/config-common.inc.php
+++ b/demo/php/config-common.inc.php
@@ -20,7 +20,7 @@
 $cfg['Servers'][$i]['history'] = 'pma__history';
 $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
 $cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords';
-#$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
+// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
 $cfg['Servers'][$i]['recent'] = 'pma__recent';
 $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
 $cfg['Servers'][$i]['users'] = 'pma__users';
@@ -54,7 +54,7 @@
 $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
 $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
 $cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords';
-#$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
+// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
 $cfg['Servers'][$i]['recent'] = 'pma__recent';
 $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
 $cfg['Servers'][$i]['users'] = 'pma__users';
@@ -78,7 +78,8 @@
 
 /* End of servers configuration */
 
-$cfg['blowfish_secret'] = '1234567890123456789012345678901234567890';
+// Random generated string (should be 32 bytes long)
+$cfg['blowfish_secret'] = 'nH5&L56HLDFbsgHHpP$HChD8hop@4xHn';
 
 $cfg['Error_Handler']['display'] = true;
 $cfg['Error_Handler']['gather'] = false;
@@ -88,6 +89,5 @@
 $cfg['TranslationWarningThreshold'] = 95;
 $cfg['ServerDefault'] = 2;
 $cfg['CSPAllow'] = 'www.google-analytics.com ssl.google-analytics.com';
-#$cfg['MaxDbList'] = 3;
+// $cfg['MaxDbList'] = 3;
 $cfg['DBG']['demo'] = true;
-?>

From dac64052bf9900af3b45e35848e0cdb428e7da88 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 3 Dec 2022 18:58:52 +0100
Subject: [PATCH 070/130] Add boodark to demo themes

Ref: https://github.com/phpmyadmin/themes/pull/94

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 demo/php/versions.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index b14fa9c..667bfae 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -24,3 +24,4 @@ themes[] = pmaterial
 themes[] = fallen
 themes[] = darkmod-neo
 themes[] = darkwolf
+themes[] = boodark

From 244bbe82f86bd09bb03cab941da757c858689773 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 7 Jan 2021 15:40:00 +0100
Subject: [PATCH 071/130] Generate a json&md report

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 phpmyadmin-report.php | 476 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 476 insertions(+)
 create mode 100755 phpmyadmin-report.php

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
new file mode 100755
index 0000000..244b89b
--- /dev/null
+++ b/phpmyadmin-report.php
@@ -0,0 +1,476 @@
+#!/bin/php
+<?php
+
+declare(strict_types=1);
+
+if (PHP_SAPI !== 'cli') {
+    exit;
+}
+
+if (PHP_VERSION_ID < 80100) {// 80 1 00
+    echo 'You need to use PHP 8.1.0 or above to run this script.' . PHP_EOL;
+    echo 'Current detected version: (' . PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION . ') (' . PHP_VERSION_ID . ').' . PHP_EOL;
+    exit(1);
+}
+
+class Reports
+{
+    private const PROJECTS = [
+        'github.com' => [
+            'phpmyadmin/phpmyadmin',
+            'phpmyadmin/phpmyadmin-security',
+            'phpmyadmin/docker',
+            'phpmyadmin/website',
+            'phpmyadmin/sql-parser',
+            'phpmyadmin/motranslator',
+            'phpmyadmin/private',
+            'phpmyadmin/shapefile',
+            'phpmyadmin/simple-math',
+            'phpmyadmin/localized_docs',
+            'phpmyadmin/error-reporting-server',
+            'phpmyadmin/twig-i18n-extension',
+        ],
+        'gitlab.com' => [],
+        'salsa.debian.org' => [
+            'phpmyadmin-team/phpmyadmin',
+            'phpmyadmin-team/twig-i18n-extension',
+            'phpmyadmin-team/mariadb-mysql-kbs',
+            'phpmyadmin-team/google-recaptcha',
+            'phpmyadmin-team/motranslator',
+            'phpmyadmin-team/sql-parser',
+            'phpmyadmin-team/shapefile',
+            'phpmyadmin-team/tcpdf',
+        ],
+    ];
+
+    /**
+     * @var array{
+     * type: "GitHub"|"GitLab", slug: string, data: array[] }
+     * }[]
+     */
+    private array $commitsStorage = [];
+
+    private bool $quietMode = false;
+    private ?DateTimeImmutable $startDate = null;
+    private ?DateTimeImmutable $endDate = null;
+    private ?string $outputJsonData = null;
+    private mixed $outputRender = STDOUT;
+    private string $monthMode = 'none';
+    // Tilde expansion: https://unix.stackexchange.com/a/151852/155610
+    private string $configFile = '~/.config/phpmyadmin';
+
+    public function run(): void
+    {
+        $shortopts  = '';
+        $shortopts .= 'qh'; // These options do not accept values
+
+        $longopts  = [
+            'output:',      // Required value
+            'output-json:', // Required value
+            'config:',      // Required value
+            'optional::',   // Optional value
+            'start-date::', // Optional value
+            'end-date::',   // Optional value
+            'help',         // No value
+            'quiet',        // No value
+            'last-month',   // No value
+            'current-month',// No value
+            'next-month',   // No value
+        ];
+        $options = getopt($shortopts, $longopts);
+
+        $this->checkExtensions();
+
+        if ($options === []) {
+            $this->printHelp();
+        }
+
+        foreach ($options as $optionName => $optionValue) {
+            if ($optionName === 'help' || $optionName === 'h') {
+                $this->printHelp();
+            }
+
+            if ($optionName === 'last-month') {
+                $this->monthMode = 'last';
+            }
+
+            if ($optionName === 'current-month') {
+                $this->monthMode = 'current';
+            }
+
+            if ($optionName === 'next-month') {
+                $this->monthMode = 'next';
+            }
+
+            if ($optionName === 'next-month') {
+                $this->monthMode = 'next';
+            }
+
+            if ($optionName === 'start-date') {
+                $this->monthMode = 'custom';
+                $this->startDate = new DateTimeImmutable($optionValue . 'T00:00:00Z');
+            }
+
+            if ($optionName === 'end-date') {
+                $this->monthMode = 'custom';
+                $this->endDate = new DateTimeImmutable($optionValue . 'T23:59:59Z');
+            }
+
+            if ($optionName === 'quiet' || $optionName === 'q') {
+                $this->quietMode = true;
+            }
+
+            if ($optionName === 'config') {
+                $this->configFile = $optionValue;
+            }
+
+            if ($optionName === 'output') {
+                $this->outputRender = $optionValue;
+            }
+
+            if ($optionName !== 'output-json') {
+                continue;
+            }
+
+            $this->outputJsonData = $optionValue;
+        }
+
+        $this->configFile = $this->expandTilde($this->configFile);
+        $this->detectCheckConfig();
+        $this->loadDates();
+
+        $this->readConfig();
+        $this->printFinalData();
+        $this->renderFinalData();
+    }
+
+    /**
+     * @source https://compwright.com/2013-09-03/tilde-expansion-in-php/
+     */
+    private function expandTilde(string $path): string
+    {
+        if (function_exists('posix_getuid') && strpos($path, '~') !== false) {
+            $info = posix_getpwuid(posix_getuid());
+
+            return str_replace('~', $info['dir'], $path);
+        }
+
+        return $path;
+    }
+
+    private function printHelp(): void
+    {
+        fwrite(STDOUT, 'Usage:' . "\n");
+        fwrite(STDOUT, '  Help: ./phpmyadmin-report.sh -h' . "\n");
+        fwrite(STDOUT, '  Help: ./phpmyadmin-report.sh --help' . "\n");
+        fwrite(STDOUT, '  Turn off debug: ./phpmyadmin-report.sh --quiet' . "\n");
+        fwrite(STDOUT, '  Turn off debug: ./phpmyadmin-report.sh -q' . "\n");
+        fwrite(STDOUT, '  Custom config: ./phpmyadmin-report.sh --config /home/user/report-config.conf' . "\n");
+        fwrite(STDOUT, '  Custom output: ./phpmyadmin-report.sh --output /home/user/report-output.md' . "\n");
+        fwrite(STDOUT, '  Store json data: ./phpmyadmin-report.sh --output-json /home/user/report-data.json' . "\n");
+        fwrite(STDOUT, '  Last month: ./phpmyadmin-report.sh --last-month' . "\n");
+        fwrite(STDOUT, '  Current month: ./phpmyadmin-report.sh --current-month' . "\n");
+        fwrite(STDOUT, '  Next month: ./phpmyadmin-report.sh --next-month' . "\n");
+        fwrite(STDOUT, '  Custom dates: ./phpmyadmin-report.sh --start-date 2021-05-03 --end-date 2021-06-27' . "\n");
+        exit(0);
+    }
+
+    private function checkExt(string $extName): void
+    {
+        if (extension_loaded($extName)) {
+            return;
+        }
+
+        $this->quitError($extName . ' could not be found');
+    }
+
+    private function quitError(string $message, int $exitCode = 1): void
+    {
+        fwrite(STDERR, "\033[0;31m[ERROR] " . $message . "\033[0m" . "\n");
+        exit($exitCode);
+    }
+
+    private function logDebug(string $message): void
+    {
+        if ($this->quietMode) {
+            return;
+        }
+
+        fwrite(STDERR, "\033[1;35m[DEBUG] " . $message . "\033[0m" . "\n");
+    }
+
+    private function logInfo(string $message): void
+    {
+        if ($this->quietMode) {
+            return;
+        }
+
+        fwrite(STDERR, "\033[1;35m[INFO] ${message}\033[0m" . "\n");
+    }
+
+    private function checkExtensions(): void
+    {
+        $this->checkExt('curl');
+    }
+
+    private function detectCheckConfig(): void
+    {
+        if (file_exists($this->configFile)) {
+            return;
+        }
+
+        $this->quitError('Missing config file at: ' . $this->configFile);
+    }
+
+    private function readConfig(): void
+    {
+        $config = parse_ini_file(
+            $this->configFile,
+            true,
+            INI_SCANNER_NORMAL
+        );
+
+        foreach ($config as $configBlockName => $configBlock) {
+            $this->processConfigBlock($configBlock, $configBlockName);
+        }
+    }
+
+    private function getGitLabHost(?string $host): string
+    {
+        if ($host === null || $host === '') {
+            return 'gitlab.com';
+        }
+
+        return $host;
+    }
+
+    private function processConfigBlock(array $configBlockIn, string $configBlockName): void
+    {
+        $typeOrName = $configBlockIn['type'] ?? $configBlockName ?? '?';
+
+        if ($typeOrName === 'gitlab') {
+            $this->processGitLab($configBlockIn);
+        } elseif ($typeOrName === 'github') {
+            $this->processGitHub($configBlockIn);
+        }
+    }
+
+    private function processGitLab(array $configBlockIn): void
+    {
+        $this->logDebug('Processing GitLab projects...');
+
+        $host = $this->getGitLabHost($configBlockIn['host'] ?? null);
+
+        foreach (self::PROJECTS[$host] ?? [] as $projectSlug) {
+            $this->processGitLabProject($configBlockIn, $projectSlug);
+        }
+
+        $this->logDebug('Processing GitLab projects done.');
+    }
+
+    private function processGitHub(array $configBlockIn): void
+    {
+        $this->logDebug('Processing GitHub projects...');
+
+        $host = 'github.com';
+        foreach (self::PROJECTS[$host] as $projectSlug) {
+            $this->processGitHubProject($configBlockIn, $projectSlug);
+        }
+
+        $this->logDebug('Processing GitHub projects done.');
+    }
+
+    private function callApi(string $url, array $requestHeaders): array
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_USERAGENT, 'phpMyAdmin/reporting-script');
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $requestHeaders);
+
+        $data = curl_exec($ch);
+        if ($data === false) {
+            $this->quitError(
+                'Error while fetching: ' . $url . ' (' . curl_error($ch) . ')'
+            );
+        }
+
+        curl_close($ch);
+
+        return json_decode($data, true);
+    }
+
+    private function callGitHubApi(array $configBlockIn, string $path): array
+    {
+        $token = $configBlockIn['token'];
+
+        return $this->callApi(
+            'https://api.github.com/' . $path,
+            [
+                'Authorization: token ' . $token,
+                'Accept: application/vnd.github+json',
+            ]
+        );
+    }
+
+    private function callGitLabApi(array $configBlockIn, string $path): array
+    {
+        $token = $configBlockIn['token'];
+        $host = $configBlockIn['host'];
+
+        return $this->callApi('https://' . $host . '/api/' . $path, ['Authorization: Bearer ' . $token]);
+    }
+
+    private function processGitLabProject(array $configBlockIn, string $projectSlug): void
+    {
+        $projectSlugUrl = urlencode($projectSlug);
+        $authorEmail = $configBlockIn['authorEmail'];
+        $this->logDebug('Processing GitLab project: ' . $projectSlug);
+        $startDate = $this->startDate->format('Y-m-d');
+        $endDate = $this->endDate->format('Y-m-d');
+        $commits = $this->callGitLabApi(
+            $configBlockIn,
+            "v4/projects/${projectSlugUrl}/repository/commits?since=${startDate}&until=${endDate}"
+        );
+
+        $commits = array_filter($commits, static function (array $commit) use ($authorEmail): bool {
+            return $commit['author_email'] === $authorEmail;
+        });
+        $this->gitLabCommitsToStorage($commits, $projectSlug);
+    }
+
+    private function processGitHubProject(array $configBlockIn, string $projectSlug): void
+    {
+        $username = $configBlockIn['user'];
+        $this->logDebug('Processing GitHub project: ' . $projectSlug);
+        $startDate = $this->startDate->format('Y-m-d');
+        $endDate = $this->endDate->format('Y-m-d');
+        $commits = $this->callGitHubApi(
+            $configBlockIn,
+            "repos/${projectSlug}/commits?author=${username}&per_page=100&since=${startDate}&until=${endDate}"
+        );
+        if ($commits['message'] ?? false) {
+            $this->quitError('GitHub API error: ' . $commits['message']);
+        }
+
+        $this->gitHubCommitsToStorage($commits, $projectSlug);
+    }
+
+    private function gitHubCommitsToStorage(array $commits, string $projectSlug): void
+    {
+        $this->commitsStorage[] = [
+            'slug' => $projectSlug,
+            'type' => 'GitHub',
+            'commits' => array_map(static function (array $commit): array {
+                return [
+                    'sha' => $commit['sha'],
+                    'message' => explode("\n", $commit['commit']['message'], 2)[0] ?? $commit['commit']['message'],
+                    'html_url' => $commit['html_url'],
+                    'cdate' => $commit['commit']['committer']['date'],
+                ];
+            }, $commits),
+        ];
+    }
+
+    private function gitLabCommitsToStorage(array $commits, string $projectSlug): void
+    {
+        $this->commitsStorage[] = [
+            'slug' => $projectSlug,
+            'type' => 'GitLab',
+            'commits' => array_map(static function (array $commit): array {
+                return [
+                    'sha' => $commit['id'],
+                    'message' => $commit['title'],
+                    'html_url' => $commit['web_url'],
+                    'cdate' => $commit['committed_date'],
+                ];
+            }, $commits),
+        ];
+    }
+
+    private function printFinalData(): void
+    {
+        if ($this->outputJsonData === null) {
+            return;
+        }
+
+        $this->logDebug('Data count: ' . count($this->commitsStorage));
+        file_put_contents(
+            $this->outputJsonData,
+            json_encode($this->commitsStorage, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
+        );
+    }
+
+    private function printData(string $data): void
+    {
+        fwrite($this->outputRender, $data);
+    }
+
+    private function renderFinalData(): void
+    {
+        $this->printData('# Commit list' . "\n");
+
+        foreach ($this->commitsStorage as $storageEntry) {
+            if ($storageEntry['commits'] === []) {
+                continue;
+            }
+
+            $this->printData(sprintf("\n## %s (%s)\n\n", $storageEntry['slug'], $storageEntry['type']));
+
+            foreach ($storageEntry['commits'] as $commit) {
+                $message = $commit['message'];
+                if (str_contains($message, 'Translated using Weblate')) {
+                    continue;
+                }
+
+                $this->printData(
+                    sprintf(
+                        '- [%s - %s](%s)' . "\n",
+                        substr($commit['sha'], 0, 10),
+                        $message,
+                        $commit['html_url']
+                    )
+                );
+            }
+        }
+    }
+
+    private function loadDates(): void
+    {
+        if ($this->monthMode === 'none') {
+            $this->quitError('You need to specify a month mode, using cli: --{current,last,next}-month');
+        }
+
+        $this->logDebug('Using month mode: ' . $this->monthMode);
+
+        // Source: http://databobjr.blogspot.com/2011/06/get-first-and-last-day-of-month-in-bash.html
+
+        // Dates use format: YYYY-MM-DDTHH:MM:SSZ
+
+        if ($this->monthMode === 'last') {
+            // Example (current date: 04/july(07)/2021 23:27): 2021-06-01T00:00:00Z
+            $this->startDate = new DateTimeImmutable('@' . strtotime('first day of last month'));
+            // Example (current date: 04/july(07)/2021 23:27): 2021-06-30T00:00:00Z
+            $this->endDate = new DateTimeImmutable('@' . strtotime('last day of last month'));
+        }
+
+        if ($this->monthMode === 'current') {
+            // Example (current date: 04/july(07)/2021 23:27): 2021-07-01T00:00:00Z
+            $this->startDate = new DateTimeImmutable('@' . strtotime('first day of this month'));
+            // Example (current date: 04/july(07)/2021 23:27): 2021-07-31T00:00:00Z
+            $this->endDate = new DateTimeImmutable('@' . strtotime('last day of this month'));
+        }
+
+        if ($this->monthMode === 'next') {
+            // Example (current date: 04/july(07)/2021 23:27): 2021-08-01T00:00:00Z
+            $this->startDate = new DateTimeImmutable('@' . strtotime('first day of next month'));
+            // Example (current date: 04/july(07)/2021 23:27): 2021-08-31T00:00:00Z
+            $this->endDate = new DateTimeImmutable('@' . strtotime('last day of next month'));
+        }
+
+        $this->logDebug('Start date (Y-m-d): ' . $this->startDate->format('Y-m-d'));
+        $this->logDebug('End date (Y-m-d): ' . $this->endDate->format('Y-m-d'));
+    }
+}
+
+(new Reports())->run();

From 2b2eb5a3cb2e5e1ba06519a528f9fa1c2e762e60 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Fri, 9 Dec 2022 21:07:52 +0100
Subject: [PATCH 072/130] Support --by-week on phpmyadmin-report.php

---
 phpmyadmin-report.php | 61 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 15 deletions(-)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index 244b89b..c962f0d 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -56,6 +56,7 @@ class Reports
     private ?string $outputJsonData = null;
     private mixed $outputRender = STDOUT;
     private string $monthMode = 'none';
+    private string $outputMode = 'none';
     // Tilde expansion: https://unix.stackexchange.com/a/151852/155610
     private string $configFile = '~/.config/phpmyadmin';
 
@@ -76,6 +77,7 @@ public function run(): void
             'last-month',   // No value
             'current-month',// No value
             'next-month',   // No value
+            'by-week',      // No value
         ];
         $options = getopt($shortopts, $longopts);
 
@@ -128,6 +130,10 @@ public function run(): void
                 $this->outputRender = $optionValue;
             }
 
+            if ($optionName === 'by-week') {
+                $this->outputMode = 'by-week';
+            }
+
             if ($optionName !== 'output-json') {
                 continue;
             }
@@ -366,7 +372,7 @@ private function gitHubCommitsToStorage(array $commits, string $projectSlug): vo
                     'sha' => $commit['sha'],
                     'message' => explode("\n", $commit['commit']['message'], 2)[0] ?? $commit['commit']['message'],
                     'html_url' => $commit['html_url'],
-                    'cdate' => $commit['commit']['committer']['date'],
+                    'cdate' => new DateTimeImmutable($commit['commit']['committer']['date']),
                 ];
             }, $commits),
         ];
@@ -382,7 +388,7 @@ private function gitLabCommitsToStorage(array $commits, string $projectSlug): vo
                     'sha' => $commit['id'],
                     'message' => $commit['title'],
                     'html_url' => $commit['web_url'],
-                    'cdate' => $commit['committed_date'],
+                    'cdate' => new DateTimeImmutable($commit['committed_date']),
                 ];
             }, $commits),
         ];
@@ -415,26 +421,51 @@ private function renderFinalData(): void
                 continue;
             }
 
-            $this->printData(sprintf("\n## %s (%s)\n\n", $storageEntry['slug'], $storageEntry['type']));
+            if ($this->outputMode === 'by-week') {
+                $commitsGroup = array_reduce($storageEntry['commits'], static function (array $accumulator, array $element) {
+                    $accumulator[$element['cdate']->format('W')][] = $element;
 
-            foreach ($storageEntry['commits'] as $commit) {
-                $message = $commit['message'];
-                if (str_contains($message, 'Translated using Weblate')) {
-                    continue;
+                    return $accumulator;
+                }, []);
+                ksort($commitsGroup);// newer weeks first
+
+                $this->printData(sprintf("\n## %s (%s)\n\n", $storageEntry['slug'], $storageEntry['type']));
+
+                foreach ($commitsGroup as $monthNumber => $commits) {
+                    $this->printData(sprintf("\n### Week %s\n\n", $monthNumber));
+                    foreach ($commits as $commit) {
+                        $this->processCommit($commit);
+                    }
                 }
 
-                $this->printData(
-                    sprintf(
-                        '- [%s - %s](%s)' . "\n",
-                        substr($commit['sha'], 0, 10),
-                        $message,
-                        $commit['html_url']
-                    )
-                );
+                continue;
+            }
+
+            $this->printData(sprintf("\n## %s (%s)\n\n", $storageEntry['slug'], $storageEntry['type']));
+
+            foreach ($storageEntry['commits'] as $commit) {
+                $this->processCommit($commit);
             }
         }
     }
 
+    private function processCommit(array $commit): void
+    {
+        $message = $commit['message'];
+        if (str_contains($message, 'Translated using Weblate')) {
+            return;
+        }
+
+        $this->printData(
+            sprintf(
+                '- [%s - %s](%s)' . "\n",
+                substr($commit['sha'], 0, 10),
+                $message,
+                $commit['html_url']
+            )
+        );
+    }
+
     private function loadDates(): void
     {
         if ($this->monthMode === 'none') {

From a6110676c0871e88ea58d73253abc6e6efb807f1 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Fri, 9 Dec 2022 22:00:30 +0100
Subject: [PATCH 073/130] Timezone fixes and --month support on
 phpmyadmin-report.php

---
 phpmyadmin-report.php | 54 ++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index c962f0d..a5d69b0 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -69,6 +69,7 @@ public function run(): void
             'output:',      // Required value
             'output-json:', // Required value
             'config:',      // Required value
+            'month:',       // Required value
             'optional::',   // Optional value
             'start-date::', // Optional value
             'end-date::',   // Optional value
@@ -108,6 +109,12 @@ public function run(): void
                 $this->monthMode = 'next';
             }
 
+            if ($optionName === 'month') {
+                $this->monthMode = 'custom';
+                $this->startDate = new DateTimeImmutable('@' . strtotime('first day of ' . $optionValue . ' UTC'));
+                $this->endDate = new DateTimeImmutable('@' . strtotime('last day of ' . $optionValue . ' UTC'));
+            }
+
             if ($optionName === 'start-date') {
                 $this->monthMode = 'custom';
                 $this->startDate = new DateTimeImmutable($optionValue . 'T00:00:00Z');
@@ -141,6 +148,10 @@ public function run(): void
             $this->outputJsonData = $optionValue;
         }
 
+        if ($this->monthMode === 'none') {
+            $this->quitError('You need to specify a month mode, using cli: --{current,last,next}-month');
+        }
+
         $this->configFile = $this->expandTilde($this->configFile);
         $this->detectCheckConfig();
         $this->loadDates();
@@ -177,6 +188,7 @@ private function printHelp(): void
         fwrite(STDOUT, '  Last month: ./phpmyadmin-report.sh --last-month' . "\n");
         fwrite(STDOUT, '  Current month: ./phpmyadmin-report.sh --current-month' . "\n");
         fwrite(STDOUT, '  Next month: ./phpmyadmin-report.sh --next-month' . "\n");
+        fwrite(STDOUT, '  Specific month: ./phpmyadmin-report.sh --month October' . "\n");
         fwrite(STDOUT, '  Custom dates: ./phpmyadmin-report.sh --start-date 2021-05-03 --end-date 2021-06-27' . "\n");
         exit(0);
     }
@@ -421,6 +433,16 @@ private function renderFinalData(): void
                 continue;
             }
 
+            // remove some commits base on commit body "Translated using Weblate"
+            $storageEntry['commits'] = array_filter(
+                $storageEntry['commits'],
+                fn($commit) => str_contains($commit['message'], 'Translated using Weblate') === false
+            );
+
+            if ($storageEntry['commits'] === []) {
+                continue;
+            }
+
             if ($this->outputMode === 'by-week') {
                 $commitsGroup = array_reduce($storageEntry['commits'], static function (array $accumulator, array $element) {
                     $accumulator[$element['cdate']->format('W')][] = $element;
@@ -429,7 +451,7 @@ private function renderFinalData(): void
                 }, []);
                 ksort($commitsGroup);// newer weeks first
 
-                $this->printData(sprintf("\n## %s (%s)\n\n", $storageEntry['slug'], $storageEntry['type']));
+                $this->printData(sprintf("\n## %s (%s)\n", $storageEntry['slug'], $storageEntry['type']));
 
                 foreach ($commitsGroup as $monthNumber => $commits) {
                     $this->printData(sprintf("\n### Week %s\n\n", $monthNumber));
@@ -451,16 +473,11 @@ private function renderFinalData(): void
 
     private function processCommit(array $commit): void
     {
-        $message = $commit['message'];
-        if (str_contains($message, 'Translated using Weblate')) {
-            return;
-        }
-
         $this->printData(
             sprintf(
                 '- [%s - %s](%s)' . "\n",
                 substr($commit['sha'], 0, 10),
-                $message,
+                $commit['message'],
                 $commit['html_url']
             )
         );
@@ -468,10 +485,6 @@ private function processCommit(array $commit): void
 
     private function loadDates(): void
     {
-        if ($this->monthMode === 'none') {
-            $this->quitError('You need to specify a month mode, using cli: --{current,last,next}-month');
-        }
-
         $this->logDebug('Using month mode: ' . $this->monthMode);
 
         // Source: http://databobjr.blogspot.com/2011/06/get-first-and-last-day-of-month-in-bash.html
@@ -480,27 +493,30 @@ private function loadDates(): void
 
         if ($this->monthMode === 'last') {
             // Example (current date: 04/july(07)/2021 23:27): 2021-06-01T00:00:00Z
-            $this->startDate = new DateTimeImmutable('@' . strtotime('first day of last month'));
+            $this->startDate = new DateTimeImmutable('@' . strtotime('first day of last month UTC'));
             // Example (current date: 04/july(07)/2021 23:27): 2021-06-30T00:00:00Z
-            $this->endDate = new DateTimeImmutable('@' . strtotime('last day of last month'));
+            $this->endDate = new DateTimeImmutable('@' . strtotime('last day of last month UTC'));
         }
 
         if ($this->monthMode === 'current') {
             // Example (current date: 04/july(07)/2021 23:27): 2021-07-01T00:00:00Z
-            $this->startDate = new DateTimeImmutable('@' . strtotime('first day of this month'));
+            $this->startDate = new DateTimeImmutable('@' . strtotime('first day of this month UTC'));
             // Example (current date: 04/july(07)/2021 23:27): 2021-07-31T00:00:00Z
-            $this->endDate = new DateTimeImmutable('@' . strtotime('last day of this month'));
+            $this->endDate = new DateTimeImmutable('@' . strtotime('last day of this month UTC'));
         }
 
         if ($this->monthMode === 'next') {
             // Example (current date: 04/july(07)/2021 23:27): 2021-08-01T00:00:00Z
-            $this->startDate = new DateTimeImmutable('@' . strtotime('first day of next month'));
+            $this->startDate = new DateTimeImmutable('@' . strtotime('first day of next month UTC'));
             // Example (current date: 04/july(07)/2021 23:27): 2021-08-31T00:00:00Z
-            $this->endDate = new DateTimeImmutable('@' . strtotime('last day of next month'));
+            $this->endDate = new DateTimeImmutable('@' . strtotime('last day of next month UTC'));
         }
 
-        $this->logDebug('Start date (Y-m-d): ' . $this->startDate->format('Y-m-d'));
-        $this->logDebug('End date (Y-m-d): ' . $this->endDate->format('Y-m-d'));
+        $this->startDate = $this->startDate->setTime(00, 00, 00);
+        $this->startDate = $this->startDate->setTime(23, 59, 59);
+
+        $this->logDebug('Start date (Y-m-d H:i:s): ' . $this->startDate->format('Y-m-d H:i:s'));
+        $this->logDebug('End date (Y-m-d H:i:s): ' . $this->endDate->format('Y-m-d H:i:s'));
     }
 }
 

From 87a016c5252d94474076c317d97713fb829da020 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Fri, 9 Dec 2022 22:09:03 +0100
Subject: [PATCH 074/130] Support more ignore words on phpmyadmin-reports.php

---
 phpmyadmin-report.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index a5d69b0..55a0fd9 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -43,6 +43,13 @@ class Reports
         ],
     ];
 
+    private const IGNORE_WORDS = [
+        'Translated using Weblate',
+        'Merge branch ',
+        'Merge remote-tracking branch ',
+        'Update d/changelog',// Debian commits for debian/changelog
+    ];
+
     /**
      * @var array{
      * type: "GitHub"|"GitLab", slug: string, data: array[] }
@@ -433,11 +440,13 @@ private function renderFinalData(): void
                 continue;
             }
 
-            // remove some commits base on commit body "Translated using Weblate"
-            $storageEntry['commits'] = array_filter(
-                $storageEntry['commits'],
-                fn($commit) => str_contains($commit['message'], 'Translated using Weblate') === false
-            );
+            // remove some commits base on commit body
+            foreach (self::IGNORE_WORDS as $ignoreWord) {
+                $storageEntry['commits'] = array_filter(
+                    $storageEntry['commits'],
+                    static fn ($commit) => str_contains($commit['message'], $ignoreWord) === false
+                );
+            }
 
             if ($storageEntry['commits'] === []) {
                 continue;

From 740fcc7b43a2b057bd4de3a04c46f25ab789f723 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Fri, 9 Dec 2022 22:09:39 +0100
Subject: [PATCH 075/130] Add docker-library/{docs,official-images} on
 phpmyadmin-reports.php

---
 phpmyadmin-report.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index 55a0fd9..af55a89 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -29,6 +29,8 @@ class Reports
             'phpmyadmin/localized_docs',
             'phpmyadmin/error-reporting-server',
             'phpmyadmin/twig-i18n-extension',
+            'docker-library/docs',
+            'docker-library/official-images',
         ],
         'gitlab.com' => [],
         'salsa.debian.org' => [

From 7583170eaf96338bc17dd30f94af09cfbd7b3b7d Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 12 Dec 2022 12:27:22 +0100
Subject: [PATCH 076/130] Some fixes and handling "Handled issues" on
 phpmyadmin-reports.php

---
 phpmyadmin-report.php | 110 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 102 insertions(+), 8 deletions(-)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index af55a89..296c7ec 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -18,12 +18,10 @@ class Reports
     private const PROJECTS = [
         'github.com' => [
             'phpmyadmin/phpmyadmin',
-            'phpmyadmin/phpmyadmin-security',
             'phpmyadmin/docker',
             'phpmyadmin/website',
             'phpmyadmin/sql-parser',
             'phpmyadmin/motranslator',
-            'phpmyadmin/private',
             'phpmyadmin/shapefile',
             'phpmyadmin/simple-math',
             'phpmyadmin/localized_docs',
@@ -31,6 +29,9 @@ class Reports
             'phpmyadmin/twig-i18n-extension',
             'docker-library/docs',
             'docker-library/official-images',
+            // Disable private repos
+            // 'phpmyadmin/phpmyadmin-security',
+            // 'phpmyadmin/private',
         ],
         'gitlab.com' => [],
         'salsa.debian.org' => [
@@ -59,6 +60,13 @@ class Reports
      */
     private array $commitsStorage = [];
 
+    /**
+     * @var array{
+     * type: "GitHub"|"GitLab", slug: string, data: array[] }
+     * }[]
+     */
+    private array $issuesStorage = [];
+
     private bool $quietMode = false;
     private ?DateTimeImmutable $startDate = null;
     private ?DateTimeImmutable $endDate = null;
@@ -331,13 +339,19 @@ private function callGitHubApi(array $configBlockIn, string $path): array
     {
         $token = $configBlockIn['token'];
 
-        return $this->callApi(
+        $data = $this->callApi(
             'https://api.github.com/' . $path,
             [
                 'Authorization: token ' . $token,
                 'Accept: application/vnd.github+json',
             ]
         );
+
+        if ($data['message'] ?? false) {
+            $this->quitError('GitHub API error: ' . $issues['message']);
+        }
+
+        return $data;
     }
 
     private function callGitLabApi(array $configBlockIn, string $path): array
@@ -376,11 +390,41 @@ private function processGitHubProject(array $configBlockIn, string $projectSlug)
             $configBlockIn,
             "repos/${projectSlug}/commits?author=${username}&per_page=100&since=${startDate}&until=${endDate}"
         );
-        if ($commits['message'] ?? false) {
-            $this->quitError('GitHub API error: ' . $commits['message']);
-        }
 
         $this->gitHubCommitsToStorage($commits, $projectSlug);
+
+        $issues = $this->callGitHubApi(
+            $configBlockIn,
+            "repos/${projectSlug}/issues?assignee=${username}&per_page=100&since=${startDate}&sort=updated&direction=asc&state=closed"
+        );
+
+        $this->gitHubIssuesToStorage($issues, $projectSlug);
+    }
+
+    private function gitHubIssuesToStorage(array $issues, string $projectSlug): void
+    {
+        $issues = array_filter($issues, static function (array $issue): bool {
+            return isset($issue['pull_request']) === false;
+        });
+
+        $issues = array_filter($issues, function (array $issue): bool {
+            $cat = new DateTimeImmutable($issue['closed_at']);
+
+            return $cat >= $this->startDate && $cat <= $this->endDate;
+        });
+
+        $this->issuesStorage[] = [
+            'slug' => $projectSlug,
+            'type' => 'GitHub',
+            'issues' => array_map(static function (array $issue): array {
+                return [
+                    'number' => $issue['number'],
+                    'title' => $issue['title'],
+                    'html_url' => $issue['html_url'],
+                    'closed_at' => new DateTimeImmutable($issue['closed_at']),
+                ];
+            }, $issues),
+        ];
     }
 
     private function gitHubCommitsToStorage(array $commits, string $projectSlug): void
@@ -421,10 +465,14 @@ private function printFinalData(): void
             return;
         }
 
-        $this->logDebug('Data count: ' . count($this->commitsStorage));
+        $this->logDebug('Commits data count: ' . count($this->commitsStorage));
+        $this->logDebug('Issues data count: ' . count($this->issuesStorage));
         file_put_contents(
             $this->outputJsonData,
-            json_encode($this->commitsStorage, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
+            json_encode([
+                'commits' => $this->commitsStorage,
+                'issues' => $this->issuesStorage,
+            ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
         );
     }
 
@@ -480,6 +528,52 @@ private function renderFinalData(): void
                 $this->processCommit($commit);
             }
         }
+
+        $this->printData("\n" . '# Handled issues' . "\n");
+
+        foreach ($this->issuesStorage as $storageEntry) {
+            if ($storageEntry['issues'] === []) {
+                continue;
+            }
+
+            if ($this->outputMode === 'by-week') {
+                $issuesGroup = array_reduce($storageEntry['issues'], static function (array $accumulator, array $element) {
+                    $accumulator[$element['closed_at']->format('W')][] = $element;
+
+                    return $accumulator;
+                }, []);
+                ksort($issuesGroup);// newer weeks first
+
+                $this->printData(sprintf("\n## %s (%s)\n", $storageEntry['slug'], $storageEntry['type']));
+
+                foreach ($issuesGroup as $monthNumber => $issues) {
+                    $this->printData(sprintf("\n### Week %s\n\n", $monthNumber));
+                    foreach ($issues as $commit) {
+                        $this->processIssue($commit);
+                    }
+                }
+
+                continue;
+            }
+
+            $this->printData(sprintf("\n## %s (%s)\n\n", $storageEntry['slug'], $storageEntry['type']));
+
+            foreach ($storageEntry['issues'] as $commit) {
+                $this->processIssue($commit);
+            }
+        }
+    }
+
+    private function processIssue(array $issue): void
+    {
+        $this->printData(
+            sprintf(
+                '- [%s - %s](%s)' . "\n",
+                $issue['number'],
+                $issue['title'],
+                $issue['html_url']
+            )
+        );
     }
 
     private function processCommit(array $commit): void

From a617f7cd24c43b9a4ab9788d6c4439df1bcdaf8d Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 12 Dec 2022 12:47:11 +0100
Subject: [PATCH 077/130] Fix endDate hour

---
 phpmyadmin-report.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index 296c7ec..e41a0f1 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -618,7 +618,7 @@ private function loadDates(): void
         }
 
         $this->startDate = $this->startDate->setTime(00, 00, 00);
-        $this->startDate = $this->startDate->setTime(23, 59, 59);
+        $this->endDate = $this->endDate->setTime(23, 59, 59);
 
         $this->logDebug('Start date (Y-m-d H:i:s): ' . $this->startDate->format('Y-m-d H:i:s'));
         $this->logDebug('End date (Y-m-d H:i:s): ' . $this->endDate->format('Y-m-d H:i:s'));

From d43a1b62f3f8156acec5cffefdc52602ab685b62 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 12 Dec 2022 13:06:11 +0100
Subject: [PATCH 078/130] Fix use ISO format for start and end date

---
 phpmyadmin-report.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index e41a0f1..8975a38 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -367,8 +367,8 @@ private function processGitLabProject(array $configBlockIn, string $projectSlug)
         $projectSlugUrl = urlencode($projectSlug);
         $authorEmail = $configBlockIn['authorEmail'];
         $this->logDebug('Processing GitLab project: ' . $projectSlug);
-        $startDate = $this->startDate->format('Y-m-d');
-        $endDate = $this->endDate->format('Y-m-d');
+        $startDate = $this->startDate->format('Y-m-d\TH:i:sp');
+        $endDate = $this->endDate->format('Y-m-d\TH:i:sp');
         $commits = $this->callGitLabApi(
             $configBlockIn,
             "v4/projects/${projectSlugUrl}/repository/commits?since=${startDate}&until=${endDate}"
@@ -384,8 +384,8 @@ private function processGitHubProject(array $configBlockIn, string $projectSlug)
     {
         $username = $configBlockIn['user'];
         $this->logDebug('Processing GitHub project: ' . $projectSlug);
-        $startDate = $this->startDate->format('Y-m-d');
-        $endDate = $this->endDate->format('Y-m-d');
+        $startDate = $this->startDate->format('Y-m-d\TH:i:sp');
+        $endDate = $this->endDate->format('Y-m-d\TH:i:sp');
         $commits = $this->callGitHubApi(
             $configBlockIn,
             "repos/${projectSlug}/commits?author=${username}&per_page=100&since=${startDate}&until=${endDate}"
@@ -617,7 +617,9 @@ private function loadDates(): void
             $this->endDate = new DateTimeImmutable('@' . strtotime('last day of next month UTC'));
         }
 
+        $this->startDate = $this->startDate->setTimezone(new DateTimeZone('UTC'));
         $this->startDate = $this->startDate->setTime(00, 00, 00);
+        $this->endDate = $this->endDate->setTimezone(new DateTimeZone('UTC'));
         $this->endDate = $this->endDate->setTime(23, 59, 59);
 
         $this->logDebug('Start date (Y-m-d H:i:s): ' . $this->startDate->format('Y-m-d H:i:s'));

From cc25e2b3adc5f3b6a22800c2fe675600d9647f00 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 12 Jan 2023 09:11:35 +0400
Subject: [PATCH 079/130] Re-work theme updates

Ref: https://github.com/phpmyadmin/themes/issues/92
---
 demo/bin/pma-demo-update | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 4802013..79104b2 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -60,6 +60,16 @@ REMOTE_THEMES=https://github.com/phpmyadmin/themes.git
 REPOS=`awk '/^branches/ {print $3}' ~/scripts/demo/php/versions.ini`
 THEMES=`awk '/^themes/ {print $3}' ~/scripts/demo/php/versions.ini`
 
+debugLog "Updating themes"
+
+# Clone / update themes
+if [ -d $BASEDIR/themes/.git ] ; then
+    cd $BASEDIR/themes
+    git pull -q
+else
+    git clone $REMOTE_THEMES $BASEDIR/themes
+fi
+
 # Update all repositories
 for REPONAME in $REPOS ; do
     DIRNAME=$BASEDIR/$REPONAME
@@ -143,8 +153,17 @@ for REPONAME in $REPOS ; do
     fi
 
     # Cleanup all themes
+    debugLog "Removing previous themes"
     find ./themes/ -maxdepth 1 -type l -exec unlink {} \;
 
+    # Link themes
+    for THEME in $THEMES ; do
+        if [ ! -e themes/$THEME ] ; then
+            debugLog "Linking theme: $THEME"
+            ln -s ../../themes/$THEME themes/$THEME
+        fi
+    done
+
     if [ -f package.json ] ; then
         debugLog "Managing JS dependencies"
         # We still redirect output to /dev/null because even with the --silent flag, yarn still gives sass output such as
@@ -155,13 +174,6 @@ for REPONAME in $REPOS ; do
         rm -rf ./node_modules
     fi
 
-    # Link themes
-    for THEME in $THEMES ; do
-        if [ ! -e themes/$THEME ] ; then
-            ln -s ../../themes/$THEME themes/$THEME
-        fi
-    done
-
     # Generate locales
     if [ -f ./scripts/generate-mo ] ; then
         ./scripts/generate-mo --quiet
@@ -173,16 +185,6 @@ for REPONAME in $REPOS ; do
     fi
 done
 
-debugLog "Updating themes"
-
-# Clone / update themes
-if [ -d $BASEDIR/themes/.git ] ; then
-    cd $BASEDIR/themes
-    git pull -q
-else
-    git clone $REMOTE_THEMES $BASEDIR/themes
-fi
-
 debugLog "Deleting stale directories"
 
 # Delete stale directories

From e2e20186bb0ffe4854fbf2415a0f3df8117f9158 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 12 Jan 2023 09:14:06 +0400
Subject: [PATCH 080/130] Add --log-file to save the logs in silent mode

---
 demo/bin/pma-demo-update | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 79104b2..0189423 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -7,6 +7,7 @@ set -e
 
 FORCE_MODE="0"
 QUIET_MODE="0"
+LOG_FILE="/dev/null"
 
 # Source: https://stackoverflow.com/a/31024664/5155484
 while [[ $# > 0 ]]
@@ -21,6 +22,10 @@ do
             -q)
                 QUIET_MODE="1"
                 ;;
+            --log-file)
+                LOG_FILE="$2"
+                shift # option has parameter
+                ;;
             *)
                 # unknown option
                 echo "Unknown option: $key" #1>&2
@@ -34,6 +39,7 @@ do
 done
 
 debugLog() {
+    echo "$1" > $LOG_FILE
     if [ "${QUIET_MODE}" = "1" ]; then
         return
     fi

From 2451037208eefd5e0e417b55395b6b8a6a789e69 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 12 Jan 2023 09:18:15 +0400
Subject: [PATCH 081/130] Use append mode on log file

---
 demo/bin/pma-demo-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 0189423..cd3f384 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -39,7 +39,7 @@ do
 done
 
 debugLog() {
-    echo "$1" > $LOG_FILE
+    echo "$1" >> $LOG_FILE
     if [ "${QUIET_MODE}" = "1" ]; then
         return
     fi

From a24c5e5b4dd42991988413669933f20c83d1e5f0 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 12 Jan 2023 09:21:14 +0400
Subject: [PATCH 082/130] Also get yarn output on non silent mode for pma demo
 update

---
 demo/bin/pma-demo-update | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index cd3f384..e3d6bc7 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -172,10 +172,14 @@ for REPONAME in $REPOS ; do
 
     if [ -f package.json ] ; then
         debugLog "Managing JS dependencies"
-        # We still redirect output to /dev/null because even with the --silent flag, yarn still gives sass output such as
-        # $ sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css
-        # Use a subshell method to absorb all the output because "Browserslist: caniuse-lite is outdated." misbehaves
-        (yarn install --production --frozen-lockfile --non-interactive --silent) >/dev/null 2>&1
+        if [ "${QUIET_MODE}" = "1" ]; then
+            # We still redirect output to /dev/null because even with the --silent flag, yarn still gives sass output such as
+            # $ sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css
+            # Use a subshell method to absorb all the output because "Browserslist: caniuse-lite is outdated." misbehaves
+            (yarn install --production --frozen-lockfile --non-interactive --silent) >/dev/null 2>&1
+        else
+            yarn install --production --frozen-lockfile --non-interactive --silent
+        fi
         # They waste too much space, clear them out
         rm -rf ./node_modules
     fi

From 75bb9753df75ac262093832665145740b57698e5 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 12 Jan 2023 09:31:02 +0400
Subject: [PATCH 083/130] Add eyed and blueberry themes on demo

Remove ancient pmaterial
---
 demo/php/versions.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index 667bfae..690e983 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -18,10 +18,11 @@ branches[] = QA_5_2
 master-release = 5.3.0
 
 # List of themes to link
-themes[] = metro
+# mhn is 4.{8,9} only
 themes[] = mhn
-themes[] = pmaterial
 themes[] = fallen
 themes[] = darkmod-neo
 themes[] = darkwolf
 themes[] = boodark
+themes[] = eyed
+themes[] = blueberry

From 00ef734b2af5d5b89812634aa70468f292215913 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 29 Jan 2023 13:10:16 +0100
Subject: [PATCH 084/130] Reset themes repository before git pull

---
 demo/bin/pma-demo-update | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index e3d6bc7..9483923 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -71,6 +71,8 @@ debugLog "Updating themes"
 # Clone / update themes
 if [ -d $BASEDIR/themes/.git ] ; then
     cd $BASEDIR/themes
+    # Remove local theme changes
+    git reset --hard -q
     git pull -q
 else
     git clone $REMOTE_THEMES $BASEDIR/themes

From 1caeef73690da8a65ac75076df962ef19199c842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Mon, 13 Feb 2023 09:58:31 -0300
Subject: [PATCH 085/130] Replace version 5.3 with 6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 demo/php/versions.ini   | 2 +-
 website/daily-snapshots | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index 690e983..ed74d78 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -15,7 +15,7 @@ branches[] = QA_4_9
 branches[] = QA_5_2
 
 # Version of future release from master branch
-master-release = 5.3.0
+master-release = 6.0.0
 
 # List of themes to link
 # mhn is 4.{8,9} only
diff --git a/website/daily-snapshots b/website/daily-snapshots
index 68e01bd..f0cbbaa 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -30,7 +30,7 @@ git checkout master
 git reset --hard
 # Force an update
 git pull --ff-only
-./scripts/create-release.sh --daily 5.3+snapshot master
+./scripts/create-release.sh --daily 6.0+snapshot master
 
 # Storage directory
 mkdir -p /mnt/storage/files/snapshots/

From a2b2b738abccf92344831514621bfa0a9c516dab Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 19 Feb 2023 14:05:38 +0100
Subject: [PATCH 086/130] Stop daily-composer processing of QA_5_1 and QA_5_0

---
 website/daily-composer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index 7440d82..153a95b 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -12,7 +12,7 @@ set -u
 DIR=~/composer
 
 # Branches we process
-BRANCHES="QA_5_2 QA_5_1 QA_5_0 QA_4_9 master"
+BRANCHES="QA_5_2 QA_4_9 master"
 
 generate_readme() {
     cat > README.rst <<EOT

From 474850609ebfdb076685df2af4464507f5bb1ab7 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 21 Feb 2023 18:53:53 +0100
Subject: [PATCH 087/130] Upgrade phpmailer for PHP 8.2 compat

Ref: https://github.com/PHPMailer/PHPMailer/releases/tag/v6.7.1
---
 hooks/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hooks/composer.json b/hooks/composer.json
index 2160b81..b7f7f88 100644
--- a/hooks/composer.json
+++ b/hooks/composer.json
@@ -2,7 +2,7 @@
     "name": "phpmyadmin/scripts",
     "type": "project",
     "require": {
-        "phpmailer/phpmailer": "^6.0"
+        "phpmailer/phpmailer": "^6.7.1"
     },
     "homepage": "https://github.com/phpmyadmin/scripts",
     "readme": "https://github.com/phpmyadmin/scripts#readme",

From f18b518a42e55c5d6b204d21b8be691afcd88929 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 26 Feb 2023 01:23:12 +0100
Subject: [PATCH 088/130] Adjust daily-composer for 6.x

---
 website/daily-composer | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/website/daily-composer b/website/daily-composer
index 153a95b..3960ca7 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -45,8 +45,13 @@ generate_mo() {
 generate_css() {
     # You can not use --production because it creates the error "[BABEL]: Cannot find module 'browserslist'"
     yarn install --frozen-lockfile --non-interactive --silent
-    git add --force themes/*/css/*.css || echo "No css file found, not adding to git repository"
-    git add --force themes/*/css/*.css.map || echo "No css.map files found, not adding to git repository"
+    if [ -d ./public/ ]; then
+        git add --force public/themes/*/css/*.css || echo "No css file found, not adding to git repository"
+        git add --force public/themes/*/css/*.css.map || echo "No css.map files found, not adding to git repository"
+    else
+        git add --force themes/*/css/*.css || echo "No css file found, not adding to git repository"
+        git add --force themes/*/css/*.css.map || echo "No css.map files found, not adding to git repository"
+    fi
     if ! git diff --quiet --cached ; then
         git commit -m 'Update generated CSS files'
     fi
@@ -87,7 +92,11 @@ set_version_in_composer() {
 
 reset_not_allowed_to_change_source_files() {
     # Source: https://stackoverflow.com/a/68019875/5155484
-    CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!js/dist/*.js.map' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map')"
+    if [ -d ./public/ ]; then
+        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!public/js/dist/*.js' ':!public/js/dist/*.js.map' ':!locale/*.mo' ':!public/themes/*.css' ':!public/themes/*.css.map')"
+    else
+        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!js/dist/*.js.map' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map')"
+    fi
 
     if [ -z "$CHANGED_FILES" ]; then
         echo "No files did change"

From 4b297f7d74b1cbd265d4a34d0e51d16d565f78c6 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 9 Aug 2023 15:27:20 +0200
Subject: [PATCH 089/130] Adjust daily-snapshots for import_files

---
 website/daily-snapshots | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index f0cbbaa..50a759b 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -45,5 +45,4 @@ mv release/*.* /mnt/storage/files/snapshots/
 rsync -va /mnt/storage/files/ cdn:/www/
 
 # trigger website scan
-cd /home/builder/website/
-./manage.py import_files
+sudo -u builder /home/builder/website/manage.py import_files

From 6d4909f5018ad009dc8443b617ad58b1d916c6fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Wed, 13 Dec 2023 09:41:31 -0300
Subject: [PATCH 090/130] Add missing tzinfo to phpmyadmin-reports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 phpmyadmin-reports | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpmyadmin-reports b/phpmyadmin-reports
index 20ea8b8..102cf33 100755
--- a/phpmyadmin-reports
+++ b/phpmyadmin-reports
@@ -17,7 +17,7 @@ Requirements:
 from configparser import RawConfigParser, NoOptionError, NoSectionError
 import os
 import sys
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from argparse import ArgumentParser, RawDescriptionHelpFormatter
 import dateutil.parser
 try:
@@ -267,8 +267,8 @@ def main(params):
         end = args.end_date
         weekly = args.weekly
 
-    start = datetime(start.year, start.month, start.day)
-    end = datetime(end.year, end.month, end.day, 23, 59, 59)
+    start = datetime(start.year, start.month, start.day, tzinfo=timezone.utc)
+    end = datetime(end.year, end.month, end.day, 23, 59, 59, tzinfo=timezone.utc)
 
     issues, commits = get_data(user, token, start, end, weekly)
 

From 6f536cad5963c47e794b2db1fcc9b7f1bed30b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Wed, 13 Dec 2023 09:44:01 -0300
Subject: [PATCH 091/130] Update documentation-po-update for docs directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 documentation-po-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation-po-update b/documentation-po-update
index 2c3e670..c1fecfa 100755
--- a/documentation-po-update
+++ b/documentation-po-update
@@ -24,7 +24,7 @@ git fetch -q origin
 newrev=`git log -n 1 --format=format:%H origin/master`
 
 # Is there some diff?
-if git diff --stat --exit-code $oldrev..$newrev -- doc/ ; then
+if git diff --stat --exit-code $oldrev..$newrev -- docs/ ; then
     exit 0
 fi
 

From 7dc7a9fd486299f88a5ed93334282c4d42f04fee Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Thu, 14 Dec 2023 11:29:14 -0500
Subject: [PATCH 092/130] Adjust CDN sync to use their new object store

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 website/daily-snapshots | 4 ++--
 website/sync-files-cdn  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index 50a759b..252ad87 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -41,8 +41,8 @@ rm -f /mnt/storage/files/snapshots/*
 # Move new files
 mv release/*.* /mnt/storage/files/snapshots/
 
-# Rsync to CDN
-rsync -va /mnt/storage/files/ cdn:/www/
+# sync to CDN
+rclone sync -q /mnt/storage/files/ cdn77:/download-object/
 
 # trigger website scan
 sudo -u builder /home/builder/website/manage.py import_files
diff --git a/website/sync-files-cdn b/website/sync-files-cdn
index bb433bc..6b038f5 100755
--- a/website/sync-files-cdn
+++ b/website/sync-files-cdn
@@ -12,8 +12,8 @@
 #        HostName example.cdn77.com
 #
 
-# rsync to CDN
-rsync -va /mnt/storage/files/ cdn:/www/
+# sync to CDN
+rclone sync -q /mnt/storage/files/ cdn77:/download-object/
 
 # trigger website scan
 cd /home/builder/website/

From 5ee4d33a87fdec11f7346c1b1a1828ff9db79d30 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Thu, 14 Dec 2023 11:16:20 -0500
Subject: [PATCH 093/130] Updated paths to accomodate the move of many scripts
 from ./scripts/ to ./bin/

Related to phpmyadmin/phpmyadmin#18798
Fixes #165

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 demo/bin/pma-demo-update | 24 +++++++++++++++++-------
 website/daily-composer   |  7 ++++++-
 website/daily-snapshots  |  3 ++-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 9483923..7dc2a65 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -127,6 +127,16 @@ for REPONAME in $REPOS ; do
     chmod 770 tmp/
     chgrp www-data tmp/
 
+    # TODO: This can be cleaned up and removed when no release exists with ./scripts/
+    # Find the console binary
+    if [ -d ./scripts/ ]; then
+      bin_path=scripts
+    elif [ -d ./bin/ ]; then
+      bin_path=bin
+    else
+      bin_path=""
+    fi
+
     # Update composer deps
     if [ -f composer.json ] ; then
         debugLog "Managing php dependencies"
@@ -137,13 +147,13 @@ for REPONAME in $REPOS ; do
             rm -f libraries/cache/routes.cache.php
         fi
 
-        if [ -f ./scripts/console ]; then
+        if [ -f ./$bin_path/console ]; then
             CLI_VERBOSE="-v"
             if [ "${QUIET_MODE}" = "1" ]; then
                 CLI_VERBOSE="-q"
             fi
             # Write new routing cache
-            ./scripts/console cache:warmup --routing --no-interaction ${CLI_VERBOSE}
+            ./$bin_path/console cache:warmup --routing --no-interaction ${CLI_VERBOSE}
             # Write the revision-info.php file
             # Use the CLI or fallback
             # TODO: remove fallback when no demo server is below 5.2
@@ -152,7 +162,7 @@ for REPONAME in $REPOS ; do
                 ~/scripts/demo/bin/pma-revision-info
             else
                 debugLog "Using the new revision script"
-                ./scripts/console write-revision-info --no-interaction ${CLI_VERBOSE}
+                ./$bin_path/console write-revision-info --no-interaction ${CLI_VERBOSE}
             fi
         fi
 
@@ -187,13 +197,13 @@ for REPONAME in $REPOS ; do
     fi
 
     # Generate locales
-    if [ -f ./scripts/generate-mo ] ; then
-        ./scripts/generate-mo --quiet
+    if [ -f ./$bin_path/generate-mo ] ; then
+        ./$bin_path/generate-mo --quiet
     fi
 
     # Calculate locales percentages to get warnings for missing translations
-    if [ -f ./scripts/remove-incomplete-mo ] ; then
-        ./scripts/remove-incomplete-mo 0
+    if [ -f ./$bin_path/remove-incomplete-mo ] ; then
+        ./$bin_path/remove-incomplete-mo 0
     fi
 done
 
diff --git a/website/daily-composer b/website/daily-composer
index 3960ca7..c1191e1 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -35,7 +35,12 @@ EOT
 
 generate_mo() {
     rm -rf locale
-    ./scripts/generate-mo
+    # TODO: This can be cleaned up and removed when no release exists with ./scripts/
+    if [ -f ./scripts/generate-mo ]; then
+      ./scripts/generate-mo
+    else
+      ./bin/generate-mo
+    fi
     git add -f locale
     if ! git diff --quiet --cached ; then
         git commit -m 'Update mo files'
diff --git a/website/daily-snapshots b/website/daily-snapshots
index 252ad87..f2a53c4 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -21,6 +21,7 @@ git checkout QA_5_2
 git reset --hard
 # Force an update
 git pull --ff-only
+#TODO: When changing to QA_6_0, update from ./scripts/ to ./bin/internal/
 ./scripts/create-release.sh --daily 5.2+snapshot QA_5_2
 # Destroy any possible local changes
 git reset --hard
@@ -30,7 +31,7 @@ git checkout master
 git reset --hard
 # Force an update
 git pull --ff-only
-./scripts/create-release.sh --daily 6.0+snapshot master
+./bin/internal/create-release.sh --daily 6.0+snapshot master
 
 # Storage directory
 mkdir -p /mnt/storage/files/snapshots/

From 8729f9c1dd6de8b235d8af1628336ffe7f0b3b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sat, 1 Jun 2024 10:58:46 -0300
Subject: [PATCH 094/130] Remove new routes cache file for demo server
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 demo/bin/pma-demo-update | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 7dc2a65..7e06faa 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -143,8 +143,10 @@ for REPONAME in $REPOS ; do
         # Dev modules are needed to use the CLI
         composer update --quiet
 
-        if [ -f libraries/cache/routes.cache.php ] ; then
+        if [ -f libraries/cache/routes.cache.php ]; then
             rm -f libraries/cache/routes.cache.php
+        elif [ -f app/cache/routes.cache.php ]; then
+            rm -f app/cache/routes.cache.php
         fi
 
         if [ -f ./$bin_path/console ]; then

From baf58403f824f966c444a6ab5b8ea97b875fec6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 4 Jun 2024 12:57:36 -0300
Subject: [PATCH 095/130] Update demo/bin/pma-revision-info to return an array
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to https://github.com/phpmyadmin/phpmyadmin/pull/16762

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 demo/bin/pma-revision-info | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/demo/bin/pma-revision-info b/demo/bin/pma-revision-info
index 8308d09..34cfde6 100755
--- a/demo/bin/pma-revision-info
+++ b/demo/bin/pma-revision-info
@@ -26,5 +26,11 @@ cat > revision-info.php.tmp <<EOT
 \$reponame = '$reponame';
 \$repobranchbase = '$repobranchbase';
 \$branch = '$ref';
+return array(
+    'revision' => '$rev',
+    'revisionUrl' => '$repobase$fullrev',
+    'branch' => '$ref',
+    'branchUrl' => '$repobranchbase$ref'
+);
 EOT
 mv revision-info.php.tmp revision-info.php

From 453905805b2046770b485cd562db92a0a1ed0474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 4 Jun 2024 13:36:22 -0300
Subject: [PATCH 096/130] Fix fetchReleaseSeriesFromFile() for PMA 6.0 src dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 demo/bin/pma-demo-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 7e06faa..dcad601 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -48,7 +48,7 @@ debugLog() {
 
 fetchReleaseSeriesFromFile() {
     # version<5.1 do not have the file
-    if [ ! -f libraries/classes/Version.php ]; then
+    if [ ! -f libraries/classes/Version.php ] || [ ! -f src/Version.php ]; then
         echo "old";
         return;
     fi

From b0a92af1b0abf0c6dc71fee7942c2651aac6e952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 4 Jun 2024 13:55:55 -0300
Subject: [PATCH 097/130] Fix themes directory for phpMyAdmin 6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 demo/bin/pma-demo-update | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index dcad601..6a6b157 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -172,15 +172,20 @@ for REPONAME in $REPOS ; do
         composer update --quiet --no-dev
     fi
 
+    THEMES_DIR='themes'
+    if [ "$(fetchReleaseSeriesFromFile)" = "6.0" ]; then
+        THEMES_DIR='public/themes'
+    fi
+
     # Cleanup all themes
     debugLog "Removing previous themes"
-    find ./themes/ -maxdepth 1 -type l -exec unlink {} \;
+    find ./$THEMES_DIR/ -maxdepth 1 -type l -exec unlink {} \;
 
     # Link themes
     for THEME in $THEMES ; do
-        if [ ! -e themes/$THEME ] ; then
+        if [ ! -e $THEMES_DIR/$THEME ] ; then
             debugLog "Linking theme: $THEME"
-            ln -s ../../themes/$THEME themes/$THEME
+            ln -s ../../themes/$THEME $THEMES_DIR/$THEME
         fi
     done
 

From a802ee78bfd9f7ae902a9bb2327e1553bc779be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 4 Jun 2024 14:11:09 -0300
Subject: [PATCH 098/130] Remove demo version 4.9.x
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

phpMyAdmin 4.9.x is in security maintenance only and it does not
supports PHP 8.2, which is the PHP version used for the demo server.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 demo/php/versions.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index ed74d78..edf716d 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -11,7 +11,6 @@ branches[] = master-config
 branches[] = master-http
 branches[] = master-config-nopmadb
 branches[] = STABLE
-branches[] = QA_4_9
 branches[] = QA_5_2
 
 # Version of future release from master branch

From affad722b566bffc62bb1dd2fb25f27ad6668944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@mfauth.net>
Date: Wed, 7 Aug 2024 22:16:50 -0300
Subject: [PATCH 099/130] Fix website/daily-composer build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
---
 website/daily-composer | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/website/daily-composer b/website/daily-composer
index c1191e1..d30b19f 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -34,14 +34,16 @@ EOT
 }
 
 generate_mo() {
-    rm -rf locale
     # TODO: This can be cleaned up and removed when no release exists with ./scripts/
     if [ -f ./scripts/generate-mo ]; then
+      rm -rf locale
       ./scripts/generate-mo
+      git add -f locale
     else
+      rm -rf resources/locale
       ./bin/generate-mo
+      git add -f resources/locale
     fi
-    git add -f locale
     if ! git diff --quiet --cached ; then
         git commit -m 'Update mo files'
     fi
@@ -65,7 +67,11 @@ generate_css() {
 generate_js() {
     # You can not use --production because it creates the error "[BABEL]: Cannot find module 'browserslist'"
     yarn install --frozen-lockfile --non-interactive --silent
-    git add --force js/dist/ || echo "No JS files found, not adding to git repository"
+    if [ -d ./public/ ]; then
+        git add --force public/js/dist/ || echo "No JS files found, not adding to git repository"
+    else
+        git add --force js/dist/ || echo "No JS files found, not adding to git repository"
+    fi
     if ! git diff --quiet --cached ; then
         git commit -m 'Update generated JS files'
     fi
@@ -98,7 +104,7 @@ set_version_in_composer() {
 reset_not_allowed_to_change_source_files() {
     # Source: https://stackoverflow.com/a/68019875/5155484
     if [ -d ./public/ ]; then
-        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!public/js/dist/*.js' ':!public/js/dist/*.js.map' ':!locale/*.mo' ':!public/themes/*.css' ':!public/themes/*.css.map')"
+        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!public/js/dist/*.js' ':!public/js/dist/*.js.map' ':!resources/locale/*.mo' ':!public/themes/*.css' ':!public/themes/*.css.map')"
     else
         CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!js/dist/*.js.map' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map')"
     fi
@@ -159,7 +165,7 @@ for branch in $BRANCHES ; do
     # Destroy any possible changes
     git reset --hard
     # Force an update just in case
-    git pull --ff
+    git pull --ff --rebase=false
 
     # Reset content that could have changed by mistake
     reset_not_allowed_to_change_source_files

From d8c97ad84a555655af933e20b90c41254de54a47 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 18 Dec 2024 03:33:46 +0100
Subject: [PATCH 100/130] Re-build the pma-demo-update script to use the create
 release script

---
 demo/bin/pma-demo-update | 338 +++++++++++++++++++++++----------------
 demo/php/versions.ini    |  17 +-
 2 files changed, 210 insertions(+), 145 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 6a6b157..15d2d7b 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -7,15 +7,19 @@ set -e
 
 FORCE_MODE="0"
 QUIET_MODE="0"
+OFFLINE_MODE="0"
 LOG_FILE="/dev/null"
 
 # Source: https://stackoverflow.com/a/31024664/5155484
-while [[ $# > 0 ]]
+while [[ $# -gt 0 ]]
 do
     key="$1"
     while [[ ${key+x} ]]
     do
         case $key in
+            --offline)
+                OFFLINE_MODE="1"
+                ;;
             --force)
                 FORCE_MODE="1"
                 ;;
@@ -39,196 +43,258 @@ do
 done
 
 debugLog() {
-    echo "$1" >> $LOG_FILE
-    if [ "${QUIET_MODE}" = "1" ]; then
+    echo "$1" >> "$LOG_FILE"
+    if [ "${QUIET_MODE}" = "1" ] ; then
         return
     fi
     echo "$1"
 }
 
-fetchReleaseSeriesFromFile() {
-    # version<5.1 do not have the file
-    if [ ! -f libraries/classes/Version.php ] || [ ! -f src/Version.php ]; then
-        echo "old";
-        return;
-    fi
-    php -r "define('VERSION_SUFFIX', ''); require_once('libraries/classes/Version.php'); echo \PhpMyAdmin\Version::SERIES;"
-}
+SCRIPTS_FOLDER="${SCRIPTS_FOLDER:-~/scripts}"
 
 # Directory where repositories are stored
-BASEDIR=~/.pma-demo
+GIT_STORAGE="${GIT_STORAGE:-~/.pma-demo}"
+
+# Directory where built folders are stored
+WEB_STORAGE="${WEB_STORAGE:-~/.pma-demo-web}"
+# The user group to own the files
+WEB_GROUP="${WEB_GROUP:-demo}"
 
 # Remote URL of repository to checkout
-REMOTE=https://github.com/phpmyadmin/phpmyadmin.git
-REMOTE_THEMES=https://github.com/phpmyadmin/themes.git
+REMOTE="${REMOTE:-https://github.com/phpmyadmin/phpmyadmin.git}"
+REMOTE_THEMES="${REMOTE_THEMES:-https://github.com/phpmyadmin/themes.git}"
 
 # List of repositories to checkout
-REPOS=`awk '/^branches/ {print $3}' ~/scripts/demo/php/versions.ini`
-THEMES=`awk '/^themes/ {print $3}' ~/scripts/demo/php/versions.ini`
+VARIANTS=$(awk '/^variants/ {print $3}' "$SCRIPTS_FOLDER/demo/php/versions.ini")
+THEMES=$(awk '/^themes/ {print $3}' "$SCRIPTS_FOLDER/demo/php/versions.ini")
 
 debugLog "Updating themes"
 
 # Clone / update themes
-if [ -d $BASEDIR/themes/.git ] ; then
-    cd $BASEDIR/themes
+if [ -d "$GIT_STORAGE/themes/.git" ] ; then
+    cd "$GIT_STORAGE/themes"
     # Remove local theme changes
     git reset --hard -q
-    git pull -q
+    if [ $OFFLINE_MODE = 0 ] ; then
+        git pull -q
+    fi
 else
-    git clone $REMOTE_THEMES $BASEDIR/themes
+    git clone "$REMOTE_THEMES" "$GIT_STORAGE/themes"
 fi
 
-# Update all repositories
-for REPONAME in $REPOS ; do
-    DIRNAME=$BASEDIR/$REPONAME
-    mkdir -p $DIRNAME
-    debugLog "Working on repository: $REPONAME"
-
-    if [ ! -d $DIRNAME/.git ] ; then
-        cd $BASEDIR
-
-        # Clone the repository
-        if [ $REPONAME != 'master' ] ; then
-            # Use master as reference repository to share objects database
-            git clone --reference $BASEDIR/master $REMOTE $REPONAME
-        else
-            git clone $REMOTE $REPONAME
-        fi
+# Clone / update phpMyAdmin
+if [ -d "$GIT_STORAGE/phpMyAdmin/.git" ] ; then
+    cd "$GIT_STORAGE/phpMyAdmin"
+    # Remove local changes
+    git reset --hard -q
+    if [ $OFFLINE_MODE = 0 ] ; then
+        git fetch --all -p
+    fi
+    git checkout temp 2> /dev/null 1> /dev/null
+else
+    git clone "$REMOTE" "$GIT_STORAGE/phpMyAdmin"
+    git checkout -b temp 2> /dev/null 1> /dev/null
+fi
 
-        # Checkout correct branch
-        cd $DIRNAME
-        git checkout ${REPONAME%%-*}
+debugLog "Deleting stale worktrees"
+cd "$GIT_STORAGE/phpMyAdmin"
 
-        # Symlink configuration
-        FLAVOUR=${REPONAME#*-}
-        if [ -f ~/scripts/demo/php/config-$FLAVOUR.inc.php ] ; then
-            ln -sf ~/scripts/demo/php/config-$FLAVOUR.inc.php config.inc.php
-        else
-            ln -sf ~/scripts/demo/php/config.inc.php config.inc.php
-        fi
-        ln -sf ~/scripts/demo/php/config.*.inc.php .
-    else
-        # Check for updates
-        cd $DIRNAME
-        orig_head=$(git log -n 1 --format=format:'%H')
-        git checkout -- yarn.lock
-        git pull -q
-        new_head=$(git log -n 1 --format=format:'%H')
+WORKTREES="$(git worktree list --porcelain | grep -F "worktree" | cut -d ' ' -f 2)"
 
-        # Check if there has been an update
-        if [ $orig_head = $new_head -a "${FORCE_MODE}" = "0" ] ; then
-            debugLog "Skipping repository: $REPONAME, no update found"
+# Delete stale worktrees
+for WORKTREE_PATH in $WORKTREES ; do
+    if [ "$WORKTREE_PATH" = "$GIT_STORAGE/phpMyAdmin" ] ; then
+        # Skip the current path
+        continue
+    fi
+
+    debugLog "Checking worktree $WORKTREE_PATH"
+    WORKTREE_NAME=${WORKTREE_PATH##*/}
+    for VARIANT_DATA in $VARIANTS ; do
+        VARIANT_NAME=${VARIANT_DATA%%:*}
+        if [ -z "$VARIANT_NAME" ] ; then
+            debugLog "Invalid variant data: $VARIANT_DATA"
             continue
         fi
+
+        if [ "$VARIANT_NAME" = "$WORKTREE_NAME" ] ; then
+            # Skip the item
+            continue 2
+        fi
+    done
+    debugLog "Deleting stale worktree $WORKTREE_PATH"
+    git worktree remove "$WORKTREE_PATH"
+done
+
+unset WORKTREES
+cd - > /dev/null
+
+# Build worktrees
+for VARIANT_DATA in $VARIANTS ; do
+    VARIANT_NAME=${VARIANT_DATA%%:*}
+    VARIANT_BRANCH=${VARIANT_DATA##*:}
+    if [ -z "$VARIANT_NAME" ] || [ -z "$VARIANT_BRANCH" ] ; then
+        debugLog "Invalid variant data: $VARIANT_DATA"
+        continue
     fi
 
-    # Create temp dir
-    mkdir -p tmp/
-    chmod 770 tmp/
-    chgrp www-data tmp/
-
-    # TODO: This can be cleaned up and removed when no release exists with ./scripts/
-    # Find the console binary
-    if [ -d ./scripts/ ]; then
-      bin_path=scripts
-    elif [ -d ./bin/ ]; then
-      bin_path=bin
+    # Only one worktree per branch is possible
+    WORKTREE_PATH="$GIT_STORAGE/$VARIANT_BRANCH"
+
+    if [ -d "$WORKTREE_PATH" ] ; then
+        debugLog "Updating worktree $VARIANT_BRANCH for $VARIANT_NAME at $WORKTREE_PATH"
+        cd "$WORKTREE_PATH"
+        # Remove local changes
+        git reset --hard -q
+        if [ $OFFLINE_MODE = 0 ] ; then
+            git pull -q
+        fi
+        cd - > /dev/null
     else
-      bin_path=""
+        debugLog "Creating worktree $VARIANT_BRANCH for $VARIANT_NAME at $WORKTREE_PATH"
+        git worktree add "$WORKTREE_PATH" "$VARIANT_BRANCH"
+    fi
+done
+
+# Cleanup worktree folders
+for VARIANT_DATA in $VARIANTS ; do
+    VARIANT_NAME=${VARIANT_DATA%%:*}
+    VARIANT_BRANCH=${VARIANT_DATA##*:}
+    if [ -z "$VARIANT_NAME" ] || [ -z "$VARIANT_BRANCH" ] ; then
+        debugLog "Invalid variant data: $VARIANT_DATA"
+        continue
+    fi
+
+    WORKTREE_PATH="$GIT_STORAGE/$VARIANT_BRANCH"
+
+    #if [ -d "$WORKTREE_PATH/release" ] ; then
+        #debugLog "Cleaning old release files"
+        #rm -rf "$WORKTREE_PATH/release"
+    #fi
+done
+
+# Build web folders
+for VARIANT_DATA in $VARIANTS ; do
+    VARIANT_NAME=${VARIANT_DATA%%:*}
+    VARIANT_BRANCH=${VARIANT_DATA##*:}
+    if [ -z "$VARIANT_NAME" ] || [ -z "$VARIANT_BRANCH" ] ; then
+        debugLog "Invalid variant data: $VARIANT_DATA"
+        continue
     fi
 
-    # Update composer deps
-    if [ -f composer.json ] ; then
-        debugLog "Managing php dependencies"
-        # Dev modules are needed to use the CLI
-        composer update --quiet
+    WORKTREE_PATH="$GIT_STORAGE/$VARIANT_BRANCH"
+
+    debugLog "Building from $WORKTREE_PATH"
+    cd "$WORKTREE_PATH"
+    VERSION="$(grep -F "version" package.json | cut -d '"' -f 4)"
+    debugLog "Building version $VERSION from branch $VARIANT_BRANCH"
 
-        if [ -f libraries/cache/routes.cache.php ]; then
-            rm -f libraries/cache/routes.cache.php
-        elif [ -f app/cache/routes.cache.php ]; then
-            rm -f app/cache/routes.cache.php
+    SKIP_BUILD=0
+    if [ -f "$WORKTREE_PATH/release/phpMyAdmin-$VERSION.json" ] ; then
+        BUILT_COMMIT="$(grep -F "commit" "$WORKTREE_PATH/release/phpMyAdmin-$VERSION.json" |cut -d '"' -f 4)"
+        debugLog "Already built at commit $BUILT_COMMIT"
+
+        CURRENT_COMMIT=$(git log -n 1 --format=format:'%H')
+        if [ "$CURRENT_COMMIT" = "$BUILT_COMMIT" ] && [ $FORCE_MODE = 0 ] ; then
+            debugLog "Skipping building version $VERSION from branch $VARIANT_BRANCH"
+            SKIP_BUILD=1
+            continue
         fi
+    fi
+
+    RELEASE_SCRIPT="$WORKTREE_PATH/scripts/create-release.sh"
+    THEMES_FOLDER="themes"
+    if [ -f "$WORKTREE_PATH/bin/internal/create-release.sh" ] ; then
+        RELEASE_SCRIPT="$WORKTREE_PATH/bin/internal/create-release.sh"
+        THEMES_FOLDER="public/themes"
+    fi
 
-        if [ -f ./$bin_path/console ]; then
-            CLI_VERBOSE="-v"
-            if [ "${QUIET_MODE}" = "1" ]; then
-                CLI_VERBOSE="-q"
-            fi
-            # Write new routing cache
-            ./$bin_path/console cache:warmup --routing --no-interaction ${CLI_VERBOSE}
-            # Write the revision-info.php file
-            # Use the CLI or fallback
-            # TODO: remove fallback when no demo server is below 5.2
-            if [ "$(fetchReleaseSeriesFromFile)" = "5.1" ] || [ "$(fetchReleaseSeriesFromFile)" = "old" ]; then
-                debugLog "Using the old revision script"
-                ~/scripts/demo/bin/pma-revision-info
-            else
-                debugLog "Using the new revision script"
-                ./$bin_path/console write-revision-info --no-interaction ${CLI_VERBOSE}
-            fi
+    if [ $SKIP_BUILD = 0 ] ; then
+        SCRIPT_OPTIONS="--daily --no-sign --revision-info --compressions tgz --kits all-languages"
+        if [ "$VARIANT_BRANCH" = "STABLE" ] ; then
+            # Remove this when 5.2.2 is out
+            SCRIPT_OPTIONS="--daily"
+            debugLog "Skipping, the build is broken anyway"
+            continue
         fi
+        debugLog "Building the release"
+        #  > $LOG_FILE
+        COMPOSER_DISABLE_NETWORK="$OFFLINE_MODE" "$RELEASE_SCRIPT" "$VERSION" "$VARIANT_BRANCH" $SCRIPT_OPTIONS
+    fi
 
-        # Remove dev vendors
-        composer update --quiet --no-dev
+    TARBALL_TO_INSTALL="$WORKTREE_PATH/release/phpMyAdmin-$VERSION-all-languages.tar.gz"
+    if [ ! -f "$TARBALL_TO_INSTALL" ] ; then
+        debugLog "Unable to find $TARBALL_TO_INSTALL"
+        continue
     fi
 
-    THEMES_DIR='themes'
-    if [ "$(fetchReleaseSeriesFromFile)" = "6.0" ]; then
-        THEMES_DIR='public/themes'
+    WEB_FOLDER="$WEB_STORAGE/$VARIANT_NAME"
+    if [ -d "$WEB_FOLDER" ] ; then
+        debugLog "Cleaning up $WEB_FOLDER"
+        rm -rf "$WEB_FOLDER"
     fi
 
-    # Cleanup all themes
-    debugLog "Removing previous themes"
-    find ./$THEMES_DIR/ -maxdepth 1 -type l -exec unlink {} \;
+    debugLog "Creating $WEB_FOLDER"
+    mkdir "$WEB_FOLDER"
+    chgrp "$WEB_GROUP" "$WEB_FOLDER"
+
+    debugLog "Extracting $TARBALL_TO_INSTALL to $WEB_FOLDER"
+    tar -xz --strip-components=1 --directory="${WEB_FOLDER}" -f "${TARBALL_TO_INSTALL}"
+
+    # Symlink configuration
+    FLAVOUR=${VARIANT_NAME#*-}
+    debugLog "Flavour $FLAVOUR, copying configs"
+    if [ -f "$SCRIPTS_FOLDER/demo/php/config-$FLAVOUR.inc.php" ] ; then
+        cp "$SCRIPTS_FOLDER/demo/php/config-$FLAVOUR.inc.php" "$WEB_FOLDER/config.inc.php"
+    else
+        cp "$SCRIPTS_FOLDER/demo/php/config.inc.php" "$WEB_FOLDER/config.inc.php"
+    fi
+    cp "$SCRIPTS_FOLDER/demo/php/"config.*.inc.php "$WEB_FOLDER/"
 
     # Link themes
     for THEME in $THEMES ; do
-        if [ ! -e $THEMES_DIR/$THEME ] ; then
-            debugLog "Linking theme: $THEME"
-            ln -s ../../themes/$THEME $THEMES_DIR/$THEME
+        if [ ! -e "$WEB_FOLDER/$THEMES_FOLDER/$THEME" ] ; then
+            debugLog "Copying theme: $THEME"
+            cp -rp "$GIT_STORAGE/themes/$THEME" "$WEB_FOLDER/$THEMES_FOLDER/$THEME"
         fi
     done
 
-    if [ -f package.json ] ; then
-        debugLog "Managing JS dependencies"
-        if [ "${QUIET_MODE}" = "1" ]; then
-            # We still redirect output to /dev/null because even with the --silent flag, yarn still gives sass output such as
-            # $ sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css
-            # Use a subshell method to absorb all the output because "Browserslist: caniuse-lite is outdated." misbehaves
-            (yarn install --production --frozen-lockfile --non-interactive --silent) >/dev/null 2>&1
-        else
-            yarn install --production --frozen-lockfile --non-interactive --silent
-        fi
-        # They waste too much space, clear them out
-        rm -rf ./node_modules
-    fi
+    # Apply permissions globally
+    chgrp -R "$WEB_GROUP" "$WEB_FOLDER"
 
-    # Generate locales
-    if [ -f ./$bin_path/generate-mo ] ; then
-        ./$bin_path/generate-mo --quiet
-    fi
+    # Apply permissions to files and folders
+    find "$WEB_FOLDER" -type d -exec chmod 0755 {} \;
+    find "$WEB_FOLDER" -type f -exec chmod 0644 {} \;
 
-    # Calculate locales percentages to get warnings for missing translations
-    if [ -f ./$bin_path/remove-incomplete-mo ] ; then
-        ./$bin_path/remove-incomplete-mo 0
-    fi
+    # Create temp dir
+    mkdir -p "$WEB_FOLDER/tmp/"
+    chmod 770 "$WEB_FOLDER/tmp/"
+    chgrp "$WEB_GROUP" "$WEB_FOLDER/tmp/"
 done
 
 debugLog "Deleting stale directories"
 
 # Delete stale directories
-find $BASEDIR -maxdepth 1 -mindepth 1 -type d | while read DIRNAME ; do
-    REPO=${DIRNAME##*/}
-    if [ $REPO = themes ] ; then
-        continue
-    fi
-    for TESTREPO in $REPOS ; do
-        if [ $TESTREPO = $REPO ] ; then
+find "$WEB_STORAGE" -maxdepth 1 -mindepth 1 -type d | while read DIRNAME ; do
+    FOLDER_NAME=${DIRNAME##*/}
+
+    # Build web folders
+    for VARIANT_DATA in $VARIANTS ; do
+        VARIANT_NAME=${VARIANT_DATA%%:*}
+        VARIANT_BRANCH=${VARIANT_DATA##*:}
+        if [ -z "$VARIANT_NAME" ] || [ -z "$VARIANT_BRANCH" ] ; then
+            debugLog "Invalid variant data: $VARIANT_DATA"
+            continue
+        fi
+
+        if [ "$FOLDER_NAME" = "$VARIANT_NAME" ] ; then
+            debugLog "Known variant: $FOLDER_NAME"
             continue 2
         fi
     done
-    debugLog "Deleting stale repository $DIRNAME"
-    rm -rf "$DIRNAME"
+
+    debugLog "Deleting stale variant $FOLDER_NAME"
+    #rm -rf "$DIRNAME"
 done
 
 debugLog "All done"
diff --git a/demo/php/versions.ini b/demo/php/versions.ini
index edf716d..0e0eb24 100644
--- a/demo/php/versions.ini
+++ b/demo/php/versions.ini
@@ -4,16 +4,15 @@
 # It will get updated within one hour from committing changes.
 
 [demo]
-# List of branches to show, master must come first.
-# The special cases like master-* have just different configuration.
-branches[] = master
-branches[] = master-config
-branches[] = master-http
-branches[] = master-config-nopmadb
-branches[] = STABLE
-branches[] = QA_5_2
+# Format: <variant-name>:<branch>
+variants[] = master:master
+variants[] = master-config:master
+variants[] = master-http:master
+variants[] = master-config-nopmadb:master
+variants[] = STABLE:STABLE
+variants[] = QA_5_2:QA_5_2
 
-# Version of future release from master branch
+# Version of future release from master branch, used by the website
 master-release = 6.0.0
 
 # List of themes to link

From 8b2e9e3cbf1f1a2232dddadbbe1bfeb88c8052cd Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 18 Dec 2024 03:37:39 +0100
Subject: [PATCH 101/130] Avoid using ~ and use $HOME instead. ~ does not
 always expand

---
 demo/bin/pma-demo-update | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 15d2d7b..5a28942 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Script to update repositories for the demo server
-# Requires ~/scripts to be checkout of scripts repository
+# Requires $HOME/scripts to be a checkout of the scripts repository
 
 set -e
 
@@ -50,13 +50,13 @@ debugLog() {
     echo "$1"
 }
 
-SCRIPTS_FOLDER="${SCRIPTS_FOLDER:-~/scripts}"
+SCRIPTS_FOLDER="${SCRIPTS_FOLDER:-$HOME/scripts}"
 
 # Directory where repositories are stored
-GIT_STORAGE="${GIT_STORAGE:-~/.pma-demo}"
+GIT_STORAGE="${GIT_STORAGE:-$HOME/.pma-demo}"
 
 # Directory where built folders are stored
-WEB_STORAGE="${WEB_STORAGE:-~/.pma-demo-web}"
+WEB_STORAGE="${WEB_STORAGE:-$HOME/.pma-demo-web}"
 # The user group to own the files
 WEB_GROUP="${WEB_GROUP:-demo}"
 

From 224811c9fb792f2cbcb20e4aa70acdad36672c49 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 18 Dec 2024 03:46:05 +0100
Subject: [PATCH 102/130] Add -u and -o pipefail to pma-demo-update

---
 demo/bin/pma-demo-update | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 5a28942..6d486d6 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -3,7 +3,12 @@
 # Script to update repositories for the demo server
 # Requires $HOME/scripts to be a checkout of the scripts repository
 
+# Fail on undefined variables
+set -u
+# Fail on failure
 set -e
+# If a script fails, stop before the next pipe
+set -o pipefail
 
 FORCE_MODE="0"
 QUIET_MODE="0"

From c39b9b6cfdb6eede895eb66b4f6e56cc5131037d Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 18 Dec 2024 04:39:04 +0100
Subject: [PATCH 103/130] Change WEB_GROUP to www-data

---
 demo/bin/pma-demo-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 6d486d6..af76447 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -63,7 +63,7 @@ GIT_STORAGE="${GIT_STORAGE:-$HOME/.pma-demo}"
 # Directory where built folders are stored
 WEB_STORAGE="${WEB_STORAGE:-$HOME/.pma-demo-web}"
 # The user group to own the files
-WEB_GROUP="${WEB_GROUP:-demo}"
+WEB_GROUP="${WEB_GROUP:-www-data}"
 
 # Remote URL of repository to checkout
 REMOTE="${REMOTE:-https://github.com/phpmyadmin/phpmyadmin.git}"

From bd64259f47f9bfd6b8567612d6dd8af49234cfdf Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 19 Dec 2024 01:08:53 +0100
Subject: [PATCH 104/130] Send building script output to the log file

---
 demo/bin/pma-demo-update | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index af76447..11e5db9 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -223,8 +223,7 @@ for VARIANT_DATA in $VARIANTS ; do
             continue
         fi
         debugLog "Building the release"
-        #  > $LOG_FILE
-        COMPOSER_DISABLE_NETWORK="$OFFLINE_MODE" "$RELEASE_SCRIPT" "$VERSION" "$VARIANT_BRANCH" $SCRIPT_OPTIONS
+        COMPOSER_DISABLE_NETWORK="$OFFLINE_MODE" "$RELEASE_SCRIPT" "$VERSION" "$VARIANT_BRANCH" $SCRIPT_OPTIONS > $LOG_FILE
     fi
 
     TARBALL_TO_INSTALL="$WORKTREE_PATH/release/phpMyAdmin-$VERSION-all-languages.tar.gz"

From 9e1b2de7a9bdb8679ed0bebd8b1d7473afe85b4f Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 22 Dec 2024 21:04:55 +0100
Subject: [PATCH 105/130] Fix pma-demo-update script update and redirect of
 create release script

---
 demo/bin/pma-demo-update | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 11e5db9..d047e1e 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -128,7 +128,11 @@ for WORKTREE_PATH in $WORKTREES ; do
         fi
     done
     debugLog "Deleting stale worktree $WORKTREE_PATH"
-    git worktree remove "$WORKTREE_PATH"
+    if [ -d "$WORKTREE_PATH" ] ; then
+        git worktree remove "$WORKTREE_PATH"
+    else
+        rm -r "$WORKTREE_PATH/.git"
+    fi
 done
 
 unset WORKTREES
@@ -223,7 +227,7 @@ for VARIANT_DATA in $VARIANTS ; do
             continue
         fi
         debugLog "Building the release"
-        COMPOSER_DISABLE_NETWORK="$OFFLINE_MODE" "$RELEASE_SCRIPT" "$VERSION" "$VARIANT_BRANCH" $SCRIPT_OPTIONS > $LOG_FILE
+        COMPOSER_DISABLE_NETWORK="$OFFLINE_MODE" "$RELEASE_SCRIPT" "$VERSION" "$VARIANT_BRANCH" $SCRIPT_OPTIONS 2> $LOG_FILE 1> $LOG_FILE
     fi
 
     TARBALL_TO_INSTALL="$WORKTREE_PATH/release/phpMyAdmin-$VERSION-all-languages.tar.gz"

From a68f97cf67a842fd1bc7167128414de92e4dfbd7 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 22 Dec 2024 21:07:32 +0100
Subject: [PATCH 106/130] Only remove the worktree with git if the .git exists

---
 demo/bin/pma-demo-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index d047e1e..1a9a44a 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -128,7 +128,7 @@ for WORKTREE_PATH in $WORKTREES ; do
         fi
     done
     debugLog "Deleting stale worktree $WORKTREE_PATH"
-    if [ -d "$WORKTREE_PATH" ] ; then
+    if [ -d "$WORKTREE_PATH/.git" ] ; then
         git worktree remove "$WORKTREE_PATH"
     else
         rm -r "$WORKTREE_PATH/.git"

From 3c09127c71baaa8f9c80aa9e35b9b1faf9f4ef39 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 22 Dec 2024 21:08:31 +0100
Subject: [PATCH 107/130] And do delete the parent folder of the worktree

---
 demo/bin/pma-demo-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/bin/pma-demo-update b/demo/bin/pma-demo-update
index 1a9a44a..0d5694f 100755
--- a/demo/bin/pma-demo-update
+++ b/demo/bin/pma-demo-update
@@ -131,7 +131,7 @@ for WORKTREE_PATH in $WORKTREES ; do
     if [ -d "$WORKTREE_PATH/.git" ] ; then
         git worktree remove "$WORKTREE_PATH"
     else
-        rm -r "$WORKTREE_PATH/.git"
+        rm -r "$WORKTREE_PATH"
     fi
 done
 

From 10b6565f8327c0fcbb8141419ae2d562d345f14a Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 5 Jan 2025 01:36:46 +0100
Subject: [PATCH 108/130] Drop pma-planet

---
 website/pma-planet | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100755 website/pma-planet

diff --git a/website/pma-planet b/website/pma-planet
deleted file mode 100755
index 48344a2..0000000
--- a/website/pma-planet
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Script to generate Planet phpMyAdmin content
-
-set -e
-
-cd /home/builder/planet/
-git pull -q
-planet planet.ini

From 8b50ac750883473b97f85e870d5f784e6e4d7934 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 6 Jan 2025 14:00:41 +0100
Subject: [PATCH 109/130] Revert "Adjust CDN sync to use their new object
 store"

This reverts commit 7dc7a9fd486299f88a5ed93334282c4d42f04fee.
---
 website/daily-snapshots | 4 ++--
 website/sync-files-cdn  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index f2a53c4..9b44e30 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -42,8 +42,8 @@ rm -f /mnt/storage/files/snapshots/*
 # Move new files
 mv release/*.* /mnt/storage/files/snapshots/
 
-# sync to CDN
-rclone sync -q /mnt/storage/files/ cdn77:/download-object/
+# Rsync to CDN
+rsync -va /mnt/storage/files/ cdn:/www/
 
 # trigger website scan
 sudo -u builder /home/builder/website/manage.py import_files
diff --git a/website/sync-files-cdn b/website/sync-files-cdn
index 6b038f5..bb433bc 100755
--- a/website/sync-files-cdn
+++ b/website/sync-files-cdn
@@ -12,8 +12,8 @@
 #        HostName example.cdn77.com
 #
 
-# sync to CDN
-rclone sync -q /mnt/storage/files/ cdn77:/download-object/
+# rsync to CDN
+rsync -va /mnt/storage/files/ cdn:/www/
 
 # trigger website scan
 cd /home/builder/website/

From c7a71e5951a23a4c9c9ef54f88fd0dabbb540c73 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 6 Jan 2025 14:10:35 +0100
Subject: [PATCH 110/130] Add --delete-before to ensure the CDN is up to date
 with the local storage

Closes: https://github.com/phpmyadmin/phpmyadmin/issues/17590
---
 website/daily-snapshots | 2 +-
 website/sync-files-cdn  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index 9b44e30..e411b77 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -43,7 +43,7 @@ rm -f /mnt/storage/files/snapshots/*
 mv release/*.* /mnt/storage/files/snapshots/
 
 # Rsync to CDN
-rsync -va /mnt/storage/files/ cdn:/www/
+rsync --delete-before -va /mnt/storage/files/ cdn:/www/
 
 # trigger website scan
 sudo -u builder /home/builder/website/manage.py import_files
diff --git a/website/sync-files-cdn b/website/sync-files-cdn
index bb433bc..eb4caec 100755
--- a/website/sync-files-cdn
+++ b/website/sync-files-cdn
@@ -13,7 +13,7 @@
 #
 
 # rsync to CDN
-rsync -va /mnt/storage/files/ cdn:/www/
+rsync --delete-before -va /mnt/storage/files/ cdn:/www/
 
 # trigger website scan
 cd /home/builder/website/

From 8d4a84134061662829e81b83d21baea50cf699be Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 18 Jan 2025 02:10:04 +0100
Subject: [PATCH 111/130] Fix detecting 6.x for composer and fix removing files

The folder public/ was gitignored and alway existed..
---
 website/daily-composer | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/website/daily-composer b/website/daily-composer
index d30b19f..26a9750 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -52,7 +52,7 @@ generate_mo() {
 generate_css() {
     # You can not use --production because it creates the error "[BABEL]: Cannot find module 'browserslist'"
     yarn install --frozen-lockfile --non-interactive --silent
-    if [ -d ./public/ ]; then
+    if [ -f ./bin/console ]; then
         git add --force public/themes/*/css/*.css || echo "No css file found, not adding to git repository"
         git add --force public/themes/*/css/*.css.map || echo "No css.map files found, not adding to git repository"
     else
@@ -67,7 +67,7 @@ generate_css() {
 generate_js() {
     # You can not use --production because it creates the error "[BABEL]: Cannot find module 'browserslist'"
     yarn install --frozen-lockfile --non-interactive --silent
-    if [ -d ./public/ ]; then
+    if [ -f ./bin/console ]; then
         git add --force public/js/dist/ || echo "No JS files found, not adding to git repository"
     else
         git add --force js/dist/ || echo "No JS files found, not adding to git repository"
@@ -103,7 +103,16 @@ set_version_in_composer() {
 
 reset_not_allowed_to_change_source_files() {
     # Source: https://stackoverflow.com/a/68019875/5155484
-    if [ -d ./public/ ]; then
+
+    if [ -f yarn-error.log ]; then
+        rm -v yarn-error.log
+    fi
+
+    # Source: https://stackoverflow.com/a/2196755/5155484
+    echo "Cleaning ignored files"
+    git clean -fdX
+
+    if [ -f ./bin/console ]; then
         CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!public/js/dist/*.js' ':!public/js/dist/*.js.map' ':!resources/locale/*.mo' ':!public/themes/*.css' ':!public/themes/*.css.map')"
     else
         CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!js/dist/*.js.map' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map')"

From f93549e9562bf72fd022faa4e4a1bcc8c1aaade1 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 6 Feb 2025 13:11:56 +0100
Subject: [PATCH 112/130] Fix the reporting script in case of an error

And fix the example section
---
 phpmyadmin-report.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index 8975a38..fbb7f5c 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -195,18 +195,18 @@ private function expandTilde(string $path): string
     private function printHelp(): void
     {
         fwrite(STDOUT, 'Usage:' . "\n");
-        fwrite(STDOUT, '  Help: ./phpmyadmin-report.sh -h' . "\n");
-        fwrite(STDOUT, '  Help: ./phpmyadmin-report.sh --help' . "\n");
-        fwrite(STDOUT, '  Turn off debug: ./phpmyadmin-report.sh --quiet' . "\n");
-        fwrite(STDOUT, '  Turn off debug: ./phpmyadmin-report.sh -q' . "\n");
-        fwrite(STDOUT, '  Custom config: ./phpmyadmin-report.sh --config /home/user/report-config.conf' . "\n");
-        fwrite(STDOUT, '  Custom output: ./phpmyadmin-report.sh --output /home/user/report-output.md' . "\n");
-        fwrite(STDOUT, '  Store json data: ./phpmyadmin-report.sh --output-json /home/user/report-data.json' . "\n");
-        fwrite(STDOUT, '  Last month: ./phpmyadmin-report.sh --last-month' . "\n");
-        fwrite(STDOUT, '  Current month: ./phpmyadmin-report.sh --current-month' . "\n");
-        fwrite(STDOUT, '  Next month: ./phpmyadmin-report.sh --next-month' . "\n");
-        fwrite(STDOUT, '  Specific month: ./phpmyadmin-report.sh --month October' . "\n");
-        fwrite(STDOUT, '  Custom dates: ./phpmyadmin-report.sh --start-date 2021-05-03 --end-date 2021-06-27' . "\n");
+        fwrite(STDOUT, '  Help: ./phpmyadmin-report.php -h' . "\n");
+        fwrite(STDOUT, '  Help: ./phpmyadmin-report.php --help' . "\n");
+        fwrite(STDOUT, '  Turn off debug: ./phpmyadmin-report.php --quiet' . "\n");
+        fwrite(STDOUT, '  Turn off debug: ./phpmyadmin-report.php -q' . "\n");
+        fwrite(STDOUT, '  Custom config: ./phpmyadmin-report.php --config /home/user/report-config.conf' . "\n");
+        fwrite(STDOUT, '  Custom output: ./phpmyadmin-report.php --output /home/user/report-output.md' . "\n");
+        fwrite(STDOUT, '  Store json data: ./phpmyadmin-report.php --output-json /home/user/report-data.json' . "\n");
+        fwrite(STDOUT, '  Last month: ./phpmyadmin-report.php --last-month' . "\n");
+        fwrite(STDOUT, '  Current month: ./phpmyadmin-report.php --current-month' . "\n");
+        fwrite(STDOUT, '  Next month: ./phpmyadmin-report.php --next-month' . "\n");
+        fwrite(STDOUT, '  Specific month: ./phpmyadmin-report.php --month October' . "\n");
+        fwrite(STDOUT, '  Custom dates: ./phpmyadmin-report.php --start-date 2021-05-03 --end-date 2021-06-27' . "\n");
         exit(0);
     }
 
@@ -348,7 +348,7 @@ private function callGitHubApi(array $configBlockIn, string $path): array
         );
 
         if ($data['message'] ?? false) {
-            $this->quitError('GitHub API error: ' . $issues['message']);
+            $this->quitError('GitHub API (' . $path . ') error: ' . $data['message']);
         }
 
         return $data;

From c08a140a43dc7c0ca287c6e3b74f3c5d3540f915 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 6 Feb 2025 13:31:12 +0100
Subject: [PATCH 113/130] Handle failure for start and end date options, and
 document by week mode

---
 phpmyadmin-report.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index fbb7f5c..c43b93a 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -134,11 +134,17 @@ public function run(): void
 
             if ($optionName === 'start-date') {
                 $this->monthMode = 'custom';
+                if ($optionValue === false) {
+                    $this->quitError('The option --start-date needs a value, use the equal sign.');
+                }
                 $this->startDate = new DateTimeImmutable($optionValue . 'T00:00:00Z');
             }
 
             if ($optionName === 'end-date') {
                 $this->monthMode = 'custom';
+                if ($optionValue === false) {
+                    $this->quitError('The option --end-date needs a value, use the equal sign.');
+                }
                 $this->endDate = new DateTimeImmutable($optionValue . 'T23:59:59Z');
             }
 
@@ -204,9 +210,10 @@ private function printHelp(): void
         fwrite(STDOUT, '  Store json data: ./phpmyadmin-report.php --output-json /home/user/report-data.json' . "\n");
         fwrite(STDOUT, '  Last month: ./phpmyadmin-report.php --last-month' . "\n");
         fwrite(STDOUT, '  Current month: ./phpmyadmin-report.php --current-month' . "\n");
+        fwrite(STDOUT, '  Current month (by week): ./phpmyadmin-report.sh --current-month --by-week' . "\n");
         fwrite(STDOUT, '  Next month: ./phpmyadmin-report.php --next-month' . "\n");
         fwrite(STDOUT, '  Specific month: ./phpmyadmin-report.php --month October' . "\n");
-        fwrite(STDOUT, '  Custom dates: ./phpmyadmin-report.php --start-date 2021-05-03 --end-date 2021-06-27' . "\n");
+        fwrite(STDOUT, '  Custom dates: ./phpmyadmin-report.php --start-date=2021-05-03 --end-date=2021-06-27' . "\n");
         exit(0);
     }
 

From 3179d3161d5b1f2bd0d9c9fe446cf643c0e3ab48 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 16 Feb 2025 21:37:12 +0100
Subject: [PATCH 114/130] Handle failure of the GitLab API for phpMyAdmin
 reports script

---
 phpmyadmin-report.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index c43b93a..3525ecc 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -366,7 +366,13 @@ private function callGitLabApi(array $configBlockIn, string $path): array
         $token = $configBlockIn['token'];
         $host = $configBlockIn['host'];
 
-        return $this->callApi('https://' . $host . '/api/' . $path, ['Authorization: Bearer ' . $token]);
+        $data = $this->callApi('https://' . $host . '/api/' . $path, ['Authorization: Bearer ' . $token]);
+
+        if ($data['error'] ?? false) {
+            $this->quitError('GitLab API (' . $path . ') error (' . $data['error'] . ') : ' . $data['error_description']);
+        }
+
+        return $data;
     }
 
     private function processGitLabProject(array $configBlockIn, string $projectSlug): void

From b83c52d27142df6adb1527fc98192881646f96d7 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 17 Feb 2025 23:21:17 +0100
Subject: [PATCH 115/130] Handle more API failures for phpMyAdmin reports
 script and add hints and remove not (anymore) phpMyAdmin team repo

---
 phpmyadmin-report.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index 3525ecc..b15b2de 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -33,12 +33,13 @@ class Reports
             // 'phpmyadmin/phpmyadmin-security',
             // 'phpmyadmin/private',
         ],
+        // Token scopes: read_api
+        // See: https://salsa.debian.org/phpmyadmin-team/phpmyadmin/-/settings/access_tokens
         'gitlab.com' => [],
         'salsa.debian.org' => [
             'phpmyadmin-team/phpmyadmin',
             'phpmyadmin-team/twig-i18n-extension',
             'phpmyadmin-team/mariadb-mysql-kbs',
-            'phpmyadmin-team/google-recaptcha',
             'phpmyadmin-team/motranslator',
             'phpmyadmin-team/sql-parser',
             'phpmyadmin-team/shapefile',
@@ -337,9 +338,24 @@ private function callApi(string $url, array $requestHeaders): array
             );
         }
 
+        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
         curl_close($ch);
 
-        return json_decode($data, true);
+        if (! in_array($httpCode, [200, 201, 202])) {
+            $this->quitError(
+                'Error code (' . $httpCode . ') from: ' . $url . ' -> ' . $data
+            );
+        }
+
+        $jsonData = json_decode($data, true);
+        if (! is_array($jsonData)) {
+            $this->quitError(
+                'Error data from: ' . $url . ' -> ' . $data
+            );
+        }
+
+        return $jsonData;
     }
 
     private function callGitHubApi(array $configBlockIn, string $path): array
@@ -369,7 +385,7 @@ private function callGitLabApi(array $configBlockIn, string $path): array
         $data = $this->callApi('https://' . $host . '/api/' . $path, ['Authorization: Bearer ' . $token]);
 
         if ($data['error'] ?? false) {
-            $this->quitError('GitLab API (' . $path . ') error (' . $data['error'] . ') : ' . $data['error_description']);
+            $this->quitError('GitLab (' . $host . ') API (' . $path . ') error (' . $data['error'] . ') : ' . $data['error_description']);
         }
 
         return $data;

From 4590f54f2c09c4111a6fb8985f53bd405cd7157f Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 14 Sep 2025 20:14:06 +0200
Subject: [PATCH 116/130] Make daily-snapshots use a folder from the first
 argument

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-snapshots | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index e411b77..6617424 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -1,9 +1,14 @@
 #!/bin/sh
 # Script to generate daily snapshots
-set -ex
+set -eux
+
+if [ -z "${1:-}" ] || [ ! -d "${1:-}" ]; then
+    echo "Usage daily-snapshots ~/phpmyadmin.git"
+    exit 1
+fi
 
 # phpMyAdmin working copy
-cd ~/phpmyadmin
+cd "${1}"
 
 # Delete any local changes
 git reset --hard

From 4355b27a7e960f3b231477e926c12ceed7dc3f10 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 29 Sep 2025 14:28:47 +0200
Subject: [PATCH 117/130] Drop sync files to CDN FTP

I removed CDN FTP, we use our own web back-end for that.

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 website/daily-snapshots |  3 ---
 website/sync-files-cdn  | 15 ---------------
 2 files changed, 18 deletions(-)

diff --git a/website/daily-snapshots b/website/daily-snapshots
index 6617424..3fe8b51 100755
--- a/website/daily-snapshots
+++ b/website/daily-snapshots
@@ -47,8 +47,5 @@ rm -f /mnt/storage/files/snapshots/*
 # Move new files
 mv release/*.* /mnt/storage/files/snapshots/
 
-# Rsync to CDN
-rsync --delete-before -va /mnt/storage/files/ cdn:/www/
-
 # trigger website scan
 sudo -u builder /home/builder/website/manage.py import_files
diff --git a/website/sync-files-cdn b/website/sync-files-cdn
index eb4caec..9cc8f7e 100755
--- a/website/sync-files-cdn
+++ b/website/sync-files-cdn
@@ -1,20 +1,5 @@
 #!/bin/sh
 
-# Synchronizes files to CDN and notifies website about new files
-
-# Needs setup to access CDN:
-# * the ssh to server must not ask for password, see
-#   https://client.cdn77.com/support/knowledgebase/cdn-resource/how-to-use-rsync-without-password
-# * .ssh/config has to contain entry for cdn host, for example:
-#
-# Host cdn
-#        User user_foo
-#        HostName example.cdn77.com
-#
-
-# rsync to CDN
-rsync --delete-before -va /mnt/storage/files/ cdn:/www/
-
 # trigger website scan
 cd /home/builder/website/
 ./manage.py import_files

From 62da5093f653c42112c955b5d1a96586e7607481 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 29 Sep 2025 15:50:54 +0200
Subject: [PATCH 118/130] Make daily-composer use the first argument as the
 folder to use

Ref: 4590f54f2c09c4111a6fb8985f53bd405cd7157f
---
 website/daily-composer | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index 26a9750..9bf03e7 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -8,8 +8,13 @@
 set -e
 set -u
 
+if [ -z "${1:-}" ] || [ ! -d "${1:-}" ]; then
+    echo "Usage daily-composer ~/composer"
+    exit 1
+fi
+
 # Working directory
-DIR=~/composer
+DIR="${1}"
 
 # Branches we process
 BRANCHES="QA_5_2 QA_4_9 master"

From 154d1b0b5819fe16ed81a0b2ecdb1c15ad542226 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 1 Oct 2025 10:43:57 +0200
Subject: [PATCH 119/130] Make documentation-po-update use the first argument
 as the folder to use

Ref: 4590f54f2c09c4111a6fb8985f53bd405cd7157f
Ref: 62da5093f653c42112c955b5d1a96586e7607481
---
 documentation-po-update | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/documentation-po-update b/documentation-po-update
index c1fecfa..08e63dc 100755
--- a/documentation-po-update
+++ b/documentation-po-update
@@ -1,10 +1,17 @@
 #!/bin/sh
 
+# Fail on error or undefined variable
 set -e
+set -u
 
 # Updates phpMyAdmin documentation
 
-WORKDIR=~/localized_docs/
+if [ -z "${1:-}" ] || [ ! -d "${1:-}" ]; then
+    echo "Usage documentation-po-update ~/localized_docs/"
+    exit 1
+fi
+
+WORKDIR="${1}"
 
 if [ ! -d "$WORKDIR" ] ; then
     git clone git@github.com:phpmyadmin/localized_docs.git "$WORKDIR"
@@ -51,6 +58,3 @@ git push
 
 # Unlock Weblate
 wlc unlock
-
-
-

From ec091e9d855d28d55cf19488a2d9702e00db8ada Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 1 Oct 2025 12:23:11 +0200
Subject: [PATCH 120/130] daily-composer: Disable rename detection for merges

---
 website/daily-composer | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/daily-composer b/website/daily-composer
index 9bf03e7..01b0d4c 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -156,6 +156,9 @@ git fetch phpmyadmin '+refs/tags/*:refs/remotes/phpmyadmin/tags/*'
 # Destroy local changes
 git reset --hard
 
+# Disable renames detection (it breaks merges)
+git config merge.renames false
+
 # Process branches
 for branch in $BRANCHES ; do
     if [ $branch = master ] ; then

From 5e7d02ef669c1dcc509f04216a66244bdfc0533d Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 1 Oct 2025 13:31:04 +0200
Subject: [PATCH 121/130] Add js files from public/js instead of public/js/dist

Since phpmyadmin/phpmyadmin@524a39f63da58ca43aa17f70209aba3030bb03db
---
 website/daily-composer | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/daily-composer b/website/daily-composer
index 01b0d4c..d68dfaa 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -73,7 +73,7 @@ generate_js() {
     # You can not use --production because it creates the error "[BABEL]: Cannot find module 'browserslist'"
     yarn install --frozen-lockfile --non-interactive --silent
     if [ -f ./bin/console ]; then
-        git add --force public/js/dist/ || echo "No JS files found, not adding to git repository"
+        git add --force public/js/ || echo "No JS files found, not adding to git repository"
     else
         git add --force js/dist/ || echo "No JS files found, not adding to git repository"
     fi
@@ -118,7 +118,7 @@ reset_not_allowed_to_change_source_files() {
     git clean -fdX
 
     if [ -f ./bin/console ]; then
-        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!public/js/dist/*.js' ':!public/js/dist/*.js.map' ':!resources/locale/*.mo' ':!public/themes/*.css' ':!public/themes/*.css.map')"
+        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!public/js/*.js' ':!public/js/*.js.map' ':!resources/locale/*.mo' ':!public/themes/*.css' ':!public/themes/*.css.map')"
     else
         CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!js/dist/*.js.map' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map')"
     fi

From 2f233868a851962d066bc6dc8a1e621ff7d6a18a Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 1 Oct 2025 14:11:47 +0200
Subject: [PATCH 122/130] daily-composer: display still ignored files

---
 website/daily-composer | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/website/daily-composer b/website/daily-composer
index d68dfaa..288ae5c 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -194,6 +194,9 @@ for branch in $BRANCHES ; do
     generate_js
     set_version_in_composer
 
+    # Display ignored files
+    git status --ignored
+
     # Push
     git push origin $newbranch
 done
@@ -220,6 +223,9 @@ for tag in $(git branch -r | grep 'phpmyadmin/tags/\(RELEASE_[4]_[7-9]_[0-9]\+\(
     generate_js
     set_version_in_composer
 
+    # Display ignored files
+    git status --ignored
+
     # Create tag
     git tag -a -m "Composer tag for $tag" $newtag
 

From 97efeb0ac1821a58d86b4e4d594112dd208da151 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 1 Oct 2025 14:15:03 +0200
Subject: [PATCH 123/130] daily-composer: allow to force for a re-build

---
 website/daily-composer | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index 288ae5c..c49b85d 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -10,6 +10,7 @@ set -u
 
 if [ -z "${1:-}" ] || [ ! -d "${1:-}" ]; then
     echo "Usage daily-composer ~/composer"
+    echo "Usage daily-composer ~/composer --force"
     exit 1
 fi
 
@@ -172,7 +173,10 @@ for branch in $BRANCHES ; do
     if git rev-parse --verify --quiet $newbranch ; then
         git checkout $newbranch
         if [ `git log --oneline ..phpmyadmin/$branch | wc -l` -eq 0 ] ; then
-            continue
+            if [ -z "${2:-}" ] || [ "${2:-}" != "--force" ]; then
+                echo "No changes for $newbranch ($branch)"
+                continue
+            fi
         fi
         git merge --no-edit --strategy=recursive --strategy-option=theirs phpmyadmin/$branch
     else

From 4a0d29e614c43721611d33d4224d551db4809dd4 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 1 Oct 2025 14:25:23 +0200
Subject: [PATCH 124/130] daily-composer: add missing setup css files

---
 website/daily-composer | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/website/daily-composer b/website/daily-composer
index c49b85d..e050b0e 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -61,9 +61,13 @@ generate_css() {
     if [ -f ./bin/console ]; then
         git add --force public/themes/*/css/*.css || echo "No css file found, not adding to git repository"
         git add --force public/themes/*/css/*.css.map || echo "No css.map files found, not adding to git repository"
+        git add --force public/setup/*.css || echo "No css.map files found, not adding to git repository"
+        git add --force public/setup/*.css.map || echo "No css.map files found, not adding to git repository"
     else
         git add --force themes/*/css/*.css || echo "No css file found, not adding to git repository"
         git add --force themes/*/css/*.css.map || echo "No css.map files found, not adding to git repository"
+        git add --force setup/*.css || echo "No css.map files found, not adding to git repository"
+        git add --force setup/*.css.map || echo "No css.map files found, not adding to git repository"
     fi
     if ! git diff --quiet --cached ; then
         git commit -m 'Update generated CSS files'

From 892e58da856447e8eccba04fc745e14f8a2b5090 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 1 Oct 2025 14:33:19 +0200
Subject: [PATCH 125/130] daily-composer: allow setup css files to change

---
 website/daily-composer | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/daily-composer b/website/daily-composer
index e050b0e..bfd4810 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -123,9 +123,9 @@ reset_not_allowed_to_change_source_files() {
     git clean -fdX
 
     if [ -f ./bin/console ]; then
-        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!public/js/*.js' ':!public/js/*.js.map' ':!resources/locale/*.mo' ':!public/themes/*.css' ':!public/themes/*.css.map')"
+        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!public/js/*.js' ':!public/js/*.js.map' ':!resources/locale/*.mo' ':!public/themes/*.css' ':!public/themes/*.css.map' ':!public/setup/*.css' ':!public/setup/*.css.map')"
     else
-        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!js/dist/*.js.map' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map')"
+        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!js/dist/*.js.map' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map' ':!setup/*.css' ':!setup/*.css.map')"
     fi
 
     if [ -z "$CHANGED_FILES" ]; then

From e77381eade906c97cf74d2d5bcd1360097033626 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 1 Oct 2025 14:42:22 +0200
Subject: [PATCH 126/130] daily-composer: allow public/js/vendor files to
 change

---
 website/daily-composer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index bfd4810..5532d26 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -123,7 +123,7 @@ reset_not_allowed_to_change_source_files() {
     git clean -fdX
 
     if [ -f ./bin/console ]; then
-        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!public/js/*.js' ':!public/js/*.js.map' ':!resources/locale/*.mo' ':!public/themes/*.css' ':!public/themes/*.css.map' ':!public/setup/*.css' ':!public/setup/*.css.map')"
+        CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!public/js/vendor/**' ':!public/js/*.js' ':!public/js/*.js.map' ':!resources/locale/*.mo' ':!public/themes/*.css' ':!public/themes/*.css.map' ':!public/setup/*.css' ':!public/setup/*.css.map')"
     else
         CHANGED_FILES="$(git diff phpmyadmin/$branch..$newbranch --name-only -- './*' ':!README.rst' ':!js/dist/*.js' ':!js/dist/*.js.map' ':!locale/*.mo' ':!themes/*.css' ':!themes/*.css.map' ':!setup/*.css' ':!setup/*.css.map')"
     fi

From 4a9558f5d4ae090ec568077846a08db7bd33090a Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Tue, 28 Oct 2025 11:50:49 -0400
Subject: [PATCH 127/130] Automatically run borg compact to reduce the size of
 pruned repositories

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 backup/backup | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/backup/backup b/backup/backup
index 811e888..831350a 100755
--- a/backup/backup
+++ b/backup/backup
@@ -9,3 +9,10 @@ borg create ssh://borgbackup/./backups/`hostname`::'{now:%Y-%m-%d_%H:%M}' `cat /
 # - weekly backups for 8 weeks
 # - monthly backups for 12 months
 borg prune --keep-weekly 8 --keep-monthly 12 --keep-daily 14 ssh://borgbackup/./backups/`hostname`
+
+# Compact repository to free up disk space that is still in use after being de-allocated by prune.
+# This is needed since Borg 1.2.0
+# Since it doesn't exist prior to 1.2.0, we test so as to avoid failing
+if borg help compact  >/dev/null 2>&1; then
+  borg compact ssh://borgbackup/./backups/`hostname`
+fi

From c8e5c4cbbe42354caf4f76d05912593d60de6543 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 16 Nov 2025 14:36:14 +0100
Subject: [PATCH 128/130] Add more repos to scan for commits

---
 phpmyadmin-report.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/phpmyadmin-report.php b/phpmyadmin-report.php
index b15b2de..9fc9cdd 100755
--- a/phpmyadmin-report.php
+++ b/phpmyadmin-report.php
@@ -29,6 +29,11 @@ class Reports
             'phpmyadmin/twig-i18n-extension',
             'docker-library/docs',
             'docker-library/official-images',
+            'gentoo/gentoo',
+            'macports/macports-ports',
+            'termux/termux-packages',
+            'SlackBuildsOrg/slackbuilds',
+            'void-linux/void-packages',
             // Disable private repos
             // 'phpmyadmin/phpmyadmin-security',
             // 'phpmyadmin/private',
@@ -45,6 +50,11 @@ class Reports
             'phpmyadmin-team/shapefile',
             'phpmyadmin-team/tcpdf',
         ],
+	// Token scopes: read_api
+	// https://gitlab.alpinelinux.org/-/user_settings/personal_access_tokens?page=1&state=active&sort=expires_asc
+        'gitlab.alpinelinux.org' => [
+	    'alpine/aports',
+	],
     ];
 
     private const IGNORE_WORDS = [

From 976712547cbe3b51d32a83967ebfcea1161ca3a5 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 17 Feb 2026 10:49:15 +0100
Subject: [PATCH 129/130] daily-composer: remove --theirs from checkout files
 for daily-composer

fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
---
 website/daily-composer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/daily-composer b/website/daily-composer
index 5532d26..903b3db 100755
--- a/website/daily-composer
+++ b/website/daily-composer
@@ -135,7 +135,7 @@ reset_not_allowed_to_change_source_files() {
 
     echo "Files changed: $CHANGED_FILES"
 
-    echo "$CHANGED_FILES" | xargs git checkout phpmyadmin/$branch --theirs
+    echo "$CHANGED_FILES" | xargs git checkout phpmyadmin/$branch
     echo "$CHANGED_FILES" | xargs git add --force
     unset CHANGED_FILES
 

From b8b8e665f27b252c32b9b50a7c20c67ce69703b9 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 24 Feb 2026 00:10:17 +0100
Subject: [PATCH 130/130] documentation-po-update: clean the folder before git
 pull

---
 documentation-po-update | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/documentation-po-update b/documentation-po-update
index 08e63dc..fb88e83 100755
--- a/documentation-po-update
+++ b/documentation-po-update
@@ -19,6 +19,9 @@ fi
 
 cd "$WORKDIR"
 
+# Remove any possible changes
+git reset --hard -q
+
 # Update localized_docs repo
 git pull -q
 git submodule update --init -q