Nits

lib/mailer.php

@@ -35,6 +35,7 @@ class Mailer {
     protected $adminupdate = false;
     /** @var ?string */
     protected $notes;
+    /** @var ?string */
     public $capability_token;
     /** @var bool */
     protected $sensitive;
@@ -48,19 +49,22 @@ class Mailer {
 
     /** @var array<string,true> */
     private $_unexpanded = [];
+    /** @var list<string> */
     protected $_errors_reported = [];
     /** @var ?MessageSet */
     private $_ms;
 
-    /** @param ?Contact $recipient */
+    /** @param ?Contact $recipient
+     * @param array{width?:int,censor?:0|1|2,reason?:string,change?:string,adminupdate?:bool,notes?:string,capability_token?:string,sensitive?:bool} $settings */
     function __construct(Conf $conf, $recipient = null, $settings = []) {
         $this->conf = $conf;
         $this->eol = $conf->opt("postfixEOL") ?? "\r\n";
         $this->flowed = !!$this->conf->opt("mailFormatFlowed");
         $this->reset($recipient, $settings);
     }
 
-    /** @param ?Contact $recipient */
+    /** @param ?Contact $recipient
+     * @param array{width?:int,censor?:0|1|2,reason?:string,change?:string,adminupdate?:bool,notes?:string,capability_token?:string,sensitive?:bool} $settings */
     function reset($recipient = null, $settings = []) {
         $this->recipient = $recipient;
         $this->width = $settings["width"] ?? 72;

src/updateschema.php

@@ -319,7 +319,7 @@ private function drop_keys_if_exist($table, $key) {
      * @param string $column
      * @return ?int */
     private function check_column_exists($table, $column) {
-        return Dbl::fetch_ivalue($this->conf->dblink, "select exists (select * from information_schema.columns where table_schema=database() and `table_name`='$table' and `column_name`='$column') from dual");
+        return Dbl::fetch_ivalue($this->conf->dblink, "select exists (select * from information_schema.columns where table_schema=database() and `table_name`='{$table}' and `column_name`='{$column}') from dual");
     }
 
     private function v154_mimetype_extensions() {