diff --git a/composer.json b/composer.json
index 363e89efc19..1b87ad44d9d 100644
--- a/composer.json
+++ b/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",
diff --git a/composer.lock b/composer.lock
index 7bc83fa5d36..fdc8b7602a4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d60d7815e9102324a4aa81ce4c0f2afa",
+    "content-hash": "0e9c9a0dc715403f2305e91370763095",
     "packages": [
         {
             "name": "adodb/adodb-php",
@@ -3237,29 +3237,29 @@
         },
         {
             "name": "smarty/smarty",
-            "version": "v3.1.43",
+            "version": "v4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/smarty-php/smarty.git",
-                "reference": "273f7e00fec034f6d61112552e9caf08d19565b7"
+                "reference": "9e0536de18b53ba193364291ef0303b0ab9903e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/273f7e00fec034f6d61112552e9caf08d19565b7",
-                "reference": "273f7e00fec034f6d61112552e9caf08d19565b7",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/9e0536de18b53ba193364291ef0303b0ab9903e1",
+                "reference": "9e0536de18b53ba193364291ef0303b0ab9903e1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.2"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
+                "phpunit/phpunit": "^8.5 || ^7.5",
                 "smarty/smarty-lexer": "^3.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "4.0.x-dev"
                 }
             },
             "autoload": {
@@ -3283,20 +3283,23 @@
                 {
                     "name": "Rodney Rehm",
                     "email": "rodney.rehm@medialize.de"
+                },
+                {
+                    "name": "Simon Wisselink",
+                    "homepage": "https://www.iwink.nl/"
                 }
             ],
             "description": "Smarty - the compiling PHP template engine",
-            "homepage": "http://www.smarty.net",
+            "homepage": "https://smarty-php.github.io/smarty/",
             "keywords": [
                 "templating"
             ],
             "support": {
-                "forum": "http://www.smarty.net/forums/",
-                "irc": "irc://irc.freenode.org/smarty",
+                "forum": "https://github.com/smarty-php/smarty/discussions",
                 "issues": "https://github.com/smarty-php/smarty/issues",
-                "source": "https://github.com/smarty-php/smarty/tree/v3.1.43"
+                "source": "https://github.com/smarty-php/smarty/tree/v4.1.0"
             },
-            "time": "2022-01-10T09:52:40+00:00"
+            "time": "2022-02-06T20:34:27+00:00"
         },
         {
             "name": "sokil/php-isocodes",
@@ -9080,5 +9083,5 @@
     "platform-overrides": {
         "php": "7.4.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/lib/adodb-php8.1.diff b/lib/adodb-php8.1.diff
new file mode 100644
index 00000000000..a52bb30bd85
--- /dev/null
+++ b/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);
+ 	}