#7690 Bump Smarty; add ADODB annotation patch

composer.json

@@ -5,7 +5,7 @@
 		"components/jquery": "^3.5",
 		"wikimedia/less.php": "3.*",
 		"phpmailer/phpmailer": "6.*",
-		"smarty/smarty": "3.*",
+		"smarty/smarty": "4.*",
 		"ezyang/htmlpurifier": "4.*",
 		"moxiecode/plupload": "2.*",
 		"tinymce/tinymce": "^5.7",
@@ -47,7 +47,8 @@
 	"extra": {
 		"patches": {
 			"adodb/adodb-php": {
-				"Apply PKP ADODB patches": "lib/adodb.diff"
+				"Apply PKP ADODB patches": "lib/adodb.diff",
+				"Apply PKP ADODB patches": "lib/adodb-php8.1.diff"
 			},
 			"laravel/framework": {
 				"Inhibit __ Laravel helper": "lib/laravel-helper-4017.diff",

lib/adodb-php8.1.diff

@@ -0,0 +1,73 @@
+diff -u -r -N adodb.inc.php adodb.inc.php
+--- adodb.inc.php	2022-02-14 15:31:50.334270612 -0800
++++ adodb.inc.php	2022-02-14 15:33:35.659110592 -0800
+@@ -3136,20 +3136,25 @@
+ 			$this->rs = $rs;
+ 		}
+
++		#[\ReturnTypeWillChange]
+ 		function rewind() {}
+
++		#[\ReturnTypeWillChange] 
+ 		function valid() {
+ 			return !$this->rs->EOF;
+ 		}
+
++		#[\ReturnTypeWillChange]
+ 		function key() {
+ 			return false;
+ 		}
+
++		#[\ReturnTypeWillChange]
+ 		function current() {
+ 			return false;
+ 		}
+
++		#[\ReturnTypeWillChange]
+ 		function next() {}
+
+ 		function __call($func, $params) {
+@@ -3201,6 +3206,7 @@
+
+ 		function Init() {}
+
++		#[\ReturnTypeWillChange]
+ 		function getIterator() {
+ 			return new ADODB_Iterator_empty($this);
+ 		}
+@@ -3261,22 +3267,27 @@
+ 			$this->rs = $rs;
+ 		}
+
++		#[\ReturnTypeWillChange]
+ 		function rewind() {
+ 			$this->rs->MoveFirst();
+ 		}
+
++		#[\ReturnTypeWillChange] 
+ 		function valid() {
+ 			return !$this->rs->EOF;
+ 		}
+
++		#[\ReturnTypeWillChange]
+ 		function key() {
+ 			return $this->rs->_currentRow;
+ 		}
+
++		#[\ReturnTypeWillChange]
+ 		function current() {
+ 			return $this->rs->fields;
+ 		}
+
++		#[\ReturnTypeWillChange]
+ 		function next() {
+ 			$this->rs->MoveNext();
+ 		}
+@@ -3353,6 +3364,7 @@
+ 		$this->Close();
+ 	}
+
++	#[\ReturnTypeWillChange]
+ 	function getIterator() {
+ 		return new ADODB_Iterator($this);
+ 	}