.github/PULL_REQUEST_TEMPLATE.md

@@ -7,4 +7,4 @@ Checklist:
 
 Tracker ticket:
 
-https://tracker.phpbb.com/browse/PHPBB-12345
+https://tracker.phpbb.com/browse/PHPBB3-12345

git-tools/hooks/commit-msg

@@ -224,7 +224,7 @@ do
 			"footer")
 				err=$ERR_FOOTER;
 				# Each ticket is on its own line
-				echo "$line" | grep -Eq "^PHPBB3?-[0-9]+$";
+				echo "$line" | grep -Eq "^PHPBB3-[0-9]+$";
 			;;
 			"eof")
 				err=$ERR_EOF;
@@ -356,7 +356,7 @@ echo "$expecting" | grep -q "eof" || (
 	# Check the branch ticket is mentioned, doesn't make sense otherwise
 	if [ $ticket -gt 0 ]
 	then
-		echo "$tickets" | grep -Eq "\bPHPBB3?-$ticket\b" || (
+		echo "$tickets" | grep -Eq "\bPHPBB3-$ticket\b" || (
 			complain "Ticket ID [$ticket] of branch missing from list of tickets:" >&2;
 			complain "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2;
 			quit $ERR_FOOTER;

git-tools/hooks/prepare-commit-msg

@@ -47,7 +47,7 @@ then
 		# Branch is prefixed with 'ticket/', append ticket ID to message
 		if [ "$branch" != "${branch##ticket/}" ];
 		then
-			tail="$(printf '\n\nPHPBB-%s' "$ticket_id")";
+			tail="$(printf '\n\nPHPBB3-%s' "$ticket_id")";
 		fi
 	fi
 

phpBB/phpbb/console/command/user/add.php

@@ -337,7 +337,7 @@ class add extends command
 
 			$sql_ary = [
 				'user_actkey'				=> $user_actkey,
-				'user_actkey_expiration'	=> user::get_token_expiration(),
+				'user_actkey_expiration'	=> \phpbb\user::get_token_expiration(),
 			];
 
 			$sql = 'UPDATE ' . USERS_TABLE . '