Bump yaml from 2.2.1 to 2.3.0 (#2591)

package-lock.json

@@ -6458,12 +6458,13 @@
       "dev": true
     },
     "node_modules/yaml": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-      "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.0.tgz",
+      "integrity": "sha512-8/1wgzdKc7bc9E6my5wZjmdavHLvO/QOmLG1FBugblEvY4IXrLjlViIOmL24HthU042lWTDRO90Fz1Yp66UnMw==",
       "dev": true,
       "engines": {
-        "node": ">= 14"
+        "node": ">= 14",
+        "npm": ">= 7"
       }
     },
     "node_modules/yargs": {

scripts/pi-hole/php/database.php

@@ -73,12 +73,12 @@ function SQLite3_connect($filename, $mode = SQLITE3_OPEN_READONLY)
 /**
  * Add domains to a given table.
  *
- * @param $db object The SQLite3 database connection object
- * @param $table string The target table
- * @param $domains array Array of domains (strings) to be added to the table
- * @param $wildcardstyle boolean Whether to format the input domains in legacy wildcard notation
- * @param $returnnum boolean Whether to return an integer or a string
- * @param $type integer The target type (0 = exact whitelist, 1 = exact blacklist, 2 = regex whitelist, 3 = regex blacklist)
+ * @param            $db            object The SQLite3 database connection object
+ * @param            $table         string The target table
+ * @param            $domains       array Array of domains (strings) to be added to the table
+ * @param            $wildcardstyle boolean Whether to format the input domains in legacy wildcard notation
+ * @param            $returnnum     boolean Whether to return an integer or a string
+ * @param            $type          integer The target type (0 = exact whitelist, 1 = exact blacklist, 2 = regex whitelist, 3 = regex blacklist)
  * @param mixed|null $comment
  *
  * @return string Success/error and number of processed domains
@@ -199,11 +199,11 @@ function add_to_table($db, $table, $domains, $comment = null, $wildcardstyle = f
 /**
  * Remove domains from a given table.
  *
- * @param $db object The SQLite3 database connection object
- * @param $table string The target table
- * @param $domains array Array of domains (strings) to be removed from the table
+ * @param $db        object The SQLite3 database connection object
+ * @param $table     string The target table
+ * @param $domains   array Array of domains (strings) to be removed from the table
  * @param $returnnum boolean Whether to return an integer or a string
- * @param $type integer The target type (0 = exact whitelist, 1 = exact blacklist, 2 = regex whitelist, 3 = regex blacklist)
+ * @param $type      integer The target type (0 = exact whitelist, 1 = exact blacklist, 2 = regex whitelist, 3 = regex blacklist)
  *
  * @return string Success/error and number of processed domains
  */

scripts/pi-hole/php/password.php

@@ -71,9 +71,9 @@ function verifyPassword($pwhash, $use_api = false)
 
                 // Login successful, redirect the user to the original requested page
                 if (
-                    $_SERVER['REQUEST_METHOD'] === 'POST' &&
-                    strlen($_SERVER['SCRIPT_NAME']) >= 10 &&
-                    substr_compare($_SERVER['SCRIPT_NAME'], '/login.php', -10) === 0
+                    $_SERVER['REQUEST_METHOD'] === 'POST'
+                    && strlen($_SERVER['SCRIPT_NAME']) >= 10
+                    && substr_compare($_SERVER['SCRIPT_NAME'], '/login.php', -10) === 0
                 ) {
                     header('Location: '.$redirect_url);
                     exit;

scripts/pi-hole/php/teleporter.php

@@ -34,9 +34,9 @@ function archive_add_file($path, $name, $subdir = '')
 /**
  * Add the contents of a table to the archive.
  *
- * @param $name string The name of the file in the archive to save the table to
+ * @param $name  string The name of the file in the archive to save the table to
  * @param $table string The table to export
- * @param $type integer Type of domains to store
+ * @param $type  integer Type of domains to store
  */
 function archive_add_table($name, $table, $type = -1)
 {
@@ -66,7 +66,7 @@ function archive_add_table($name, $table, $type = -1)
 /**
  * Restore the contents of a table from an uploaded archive.
  *
- * @param $file object The file in the archive to restore the table from
+ * @param $file  object The file in the archive to restore the table from
  * @param $table string The table to import
  * @param $flush boolean Whether to flush the table before importing the archived data
  *
@@ -214,9 +214,9 @@ function archive_restore_table($file, $table, $flush = false)
 /**
  * Create table rows from an uploaded archive file.
  *
- * @param $file object The file in the archive to import
- * @param $table string The target table
- * @param $flush boolean Whether to flush the table before importing the archived data
+ * @param $file          object The file in the archive to import
+ * @param $table         string The target table
+ * @param $flush         boolean Whether to flush the table before importing the archived data
  * @param $wildcardstyle boolean Whether to format the input domains in legacy wildcard notation
  *
  * @return int Number of processed rows from the imported file
@@ -270,7 +270,7 @@ function archive_insert_into_table($file, $table, $flush = false, $wildcardstyle
  * Flush table if requested. This subroutine flushes each table only once.
  *
  * @param $table string The target table
- * @param $type integer Type of item to flush in table (applies only to domainlist table)
+ * @param $type  integer Type of item to flush in table (applies only to domainlist table)
  */
 function flush_table($table, $type = null)
 {