diff --git a/.github/nightly_matrix.php b/.github/nightly_matrix.php
index 846c60e8fd56d..c1f5627542684 100644
--- a/.github/nightly_matrix.php
+++ b/.github/nightly_matrix.php
@@ -49,8 +49,8 @@ function get_current_version(): array {
 
 $trigger = $argv[1] ?? 'schedule';
 $attempt = (int) ($argv[2] ?? 1);
-$monday = date('w', time()) === '1';
-$discard_cache = $monday
+$sunday = date('w', time()) === '0';
+$discard_cache = $sunday
     || ($trigger === 'schedule' && $attempt !== 1)
     || $trigger === 'workflow_dispatch';
 if ($discard_cache) {
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index b51a519533c6b..27a07fffc733b 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6393,6 +6393,11 @@ static void zend_compile_switch(zend_ast *ast) /* {{{ */
 		zend_ast *cond_ast = case_ast->child[0];
 		znode cond_node;
 
+		if (case_ast->attr == ZEND_ALT_CASE_SYNTAX) {
+			CG(zend_lineno) = case_ast->lineno;
+			zend_error(E_DEPRECATED, "Case statements followed by a semicolon (;) are deprecated, use a colon (:) instead");
+		}
+
 		if (!cond_ast) {
 			if (has_default_case) {
 				CG(zend_lineno) = case_ast->lineno;
@@ -6403,11 +6408,6 @@ static void zend_compile_switch(zend_ast *ast) /* {{{ */
 			continue;
 		}
 
-		if (case_ast->attr == ZEND_ALT_CASE_SYNTAX) {
-			CG(zend_lineno) = case_ast->lineno;
-			zend_error(E_DEPRECATED, "Case statements followed by a semicolon (;) are deprecated, use a colon (:) instead");
-		}
-
 		zend_compile_expr(&cond_node, cond_ast);
 
 		if (expr_node.op_type == IS_CONST
diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4
index ef1f5878287d0..18fa9acb3d4bd 100644
--- a/ext/tidy/config.m4
+++ b/ext/tidy/config.m4
@@ -81,7 +81,8 @@ if test "$PHP_TIDY" != "no"; then
   ])
   AS_VAR_IF([php_ac_cv_have_tidyoptgetcategory], [yes],
     [AC_DEFINE([HAVE_TIDYOPTGETCATEGORY], [1],
-      [Define to 1 if tidyOptGetCategory is available.])])
+      [Define to 1 if Tidy library has the 'tidyOptGetCategory' function and
+      supports the 'TidyInternalCategory' enumeration.])])
 
   CPPFLAGS=$old_CPPFLAGS
 
diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32
index a1f93f2976af8..1b2436ac9dfad 100644
--- a/ext/tidy/config.w32
+++ b/ext/tidy/config.w32
@@ -21,6 +21,7 @@ if (PHP_TIDY != "no") {
 		AC_DEFINE('HAVE_TIDY_H', 1, "Define to 1 if you have the <tidy.h> header file.")
 		AC_DEFINE('HAVE_TIDYOPTGETDOC', 1, "Define to 1 if Tidy library has the 'tidyOptGetDoc' function.")
 		AC_DEFINE('HAVE_TIDYRELEASEDATE', 1, "Define to 1 if Tidy library has the 'tidyReleaseDate' function.")
+		AC_DEFINE('HAVE_TIDYOPTGETCATEGORY', 1, "Define to 1 if Tidy library has the 'tidyOptGetCategory' function and supports the 'TidyInternalCategory' enumeration.")
 		ADD_FLAG('CFLAGS_TIDY', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
 		if (!PHP_TIDY_SHARED) {
 			ADD_DEF_FILE("ext\\tidy\\php_tidy.def");
diff --git a/ext/uri/uri_parser_rfc3986.c b/ext/uri/uri_parser_rfc3986.c
index 24dd4e1947b2b..628b73b123f65 100644
--- a/ext/uri/uri_parser_rfc3986.c
+++ b/ext/uri/uri_parser_rfc3986.c
@@ -20,6 +20,14 @@
 #include "Zend/zend_smart_str.h"
 #include "Zend/zend_exceptions.h"
 
+#include <uriparser/Uri.h>
+
+struct php_uri_parser_rfc3986_uris {
+	UriUriA uri;
+	UriUriA normalized_uri;
+	bool normalized_uri_initialized;
+};
+
 static void *php_uri_parser_rfc3986_memory_manager_malloc(UriMemoryManager *memory_manager, size_t size)
 {
 	return emalloc(size);
diff --git a/ext/uri/uri_parser_rfc3986.h b/ext/uri/uri_parser_rfc3986.h
index bdf792816c29f..b6d42441db7ac 100644
--- a/ext/uri/uri_parser_rfc3986.h
+++ b/ext/uri/uri_parser_rfc3986.h
@@ -17,16 +17,11 @@
 #ifndef PHP_URI_PARSER_RFC3986_H
 #define PHP_URI_PARSER_RFC3986_H
 
-#include <uriparser/Uri.h>
 #include "php_uri_common.h"
 
 extern const php_uri_parser php_uri_parser_rfc3986;
 
-typedef struct php_uri_parser_rfc3986_uris {
-	UriUriA uri;
-	UriUriA normalized_uri;
-	bool normalized_uri_initialized;
-} php_uri_parser_rfc3986_uris;
+typedef struct php_uri_parser_rfc3986_uris php_uri_parser_rfc3986_uris;
 
 zend_result php_uri_parser_rfc3986_userinfo_read(void *uri, php_uri_component_read_mode read_mode, zval *retval);
 zend_result php_uri_parser_rfc3986_userinfo_write(void *uri, zval *value, zval *errors);
diff --git a/tests/lang/033.phpt b/tests/lang/033.phpt
index 41424e40489d6..a8a5837a5501e 100644
--- a/tests/lang/033.phpt
+++ b/tests/lang/033.phpt
@@ -38,6 +38,8 @@ switch ($a):
 endswitch;
 ?>
 --EXPECTF--
+Deprecated: Case statements followed by a semicolon (;) are deprecated, use a colon (:) instead in %s
+
 Deprecated: Case statements followed by a semicolon (;) are deprecated, use a colon (:) instead in %s
 If: 11
 While: 12346789