Merge branch 'trunk' into css-api/add-css-token-processor

Author: sirreal

.github/workflows/upgrade-develop-testing.yml

@@ -75,7 +75,7 @@ jobs:
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.4' ]
         # WordPress 5.3 is the oldest version that supports PHP 7.4.
-        wp: [ '5.3', '6.8', '6.9' ]
+        wp: [ '5.3', '6.8', '6.9', '7.0-RC2' ]
         multisite: [ false, true ]
     with:
       os: ${{ matrix.os }}
@@ -101,7 +101,7 @@ jobs:
         php: [ '7.4', '8.4' ]
         db-type: [ 'mysql' ]
         db-version: [ '8.4' ]
-        wp: [ '6.8', '6.9' ]
+        wp: [ '6.8', '6.9', '7.0-RC2' ]
         multisite: [ false, true ]
     with:
       os: ${{ matrix.os }}

.github/workflows/upgrade-testing.yml

@@ -71,7 +71,7 @@ jobs:
         php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.0', '8.4', '9.6' ]
-        wp: [ '6.8', '6.9' ]
+        wp: [ '6.8', '6.9', '7.0-RC2' ]
         multisite: [ false, true ]
     with:
       os: ${{ matrix.os }}

src/wp-admin/css/color-picker.css

@@ -94,7 +94,6 @@
 	width: 4rem;
 	font-size: 12px;
 	font-family: monospace;
-	line-height: 2.33333333; /* 28px */
 	margin: 0;
 	padding: 0 5px;
 	vertical-align: top;

src/wp-admin/css/common.css

@@ -1115,7 +1115,6 @@ th.action-links {
 
 .wp-filter .search-form input[type="search"] {
 	min-height: 32px;
-	line-height: 2.14285714; /* 30px for 32px height with 14px font */
 	padding: 0 8px;
 }
 

src/wp-admin/css/customize-controls.css

@@ -2184,7 +2184,6 @@ p.customize-section-description {
 }
 
 .themes-filter-bar .wp-filter-search {
-	line-height: 2.14285714; /* 30px for 32px compact input */
 	padding: 0 10px 0 30px;
 	max-width: 100%;
 	width: 40%;

src/wp-admin/css/dashboard.css

@@ -533,7 +533,6 @@
 	width: 40%;
 	margin: 0;
 	min-height: 32px;
-	line-height: 2.14285714;
 	padding: 0 8px;
 }
 

src/wp-admin/css/forms.css

@@ -69,7 +69,6 @@ input[type="url"],
 input[type="week"] {
 	padding: 0 12px;
 	/* inherits font size 14px */
-	line-height: 2.71428571; /* 38px for 40px min-height */
 	min-height: 40px;
 }
 
@@ -816,7 +815,6 @@ p.search-box {
 p.search-box input[type="search"],
 p.search-box input[type="text"] {
 	min-height: 32px;
-	line-height: 2.14285714; /* 30px for 32px height with 14px font */
 	padding: 0 8px;
 }
 
@@ -1237,8 +1235,7 @@ table.form-table td .updated p {
 .options-general-php input.small-text {
 	width: 56px;
 	margin: -2px 0;
-	min-height: 24px;
-	line-height: 1.71428571; /* 24px for 14px font size */
+	min-height: 32px;
 }
 
 .options-general-php .spinner {
@@ -1601,7 +1598,6 @@ table.form-table td .updated p {
 		-webkit-appearance: none;
 		padding: 0 12px;
 		min-height: 40px;
-		line-height: 2.5; /* 40px for 16px font */
 	}
 
 	::-webkit-datetime-edit {

src/wp-admin/css/list-tables.css

@@ -686,7 +686,6 @@ th.sorted a span {
 	font-size: 13px;
 	text-align: center;
 	min-height: 32px;
-	line-height: 2.30769231; /* 30px for 32px height with 13px font */
 	padding: 0 8px;
 }
 
@@ -1099,7 +1098,6 @@ tr.inline-edit-row td {
 
 .inline-edit-row select,
 .inline-edit-row input:where(:not([type=checkbox],[type=radio],[type=submit],[type=button])) {
-	line-height: 2.14285714;
 	min-height: 32px;
 	padding: 0 8px 0 8px;
 }

src/wp-admin/css/media.css

@@ -568,7 +568,6 @@ border color while dragging a file over the uploader drop area */
 
 .media-frame.mode-grid .media-toolbar input[type="search"] {
 	min-height: 32px;
-	line-height: 2.14285714; /* 30px for 32px height with 14px font */
 	padding: 0 8px;
 }
 

src/wp-admin/includes/class-pclzip.php

@@ -296,7 +296,7 @@ function create($p_filelist)
       $v_size--;
 
       // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+      if ((is_int($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
@@ -479,7 +479,7 @@ function add($p_filelist)
       $v_size--;
 
       // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+      if ((is_int($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
@@ -732,7 +732,7 @@ function extract()
       $v_arg_list = func_get_args();
 
       // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+      if ((is_int($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
@@ -893,7 +893,7 @@ function extractByIndex($p_index)
       $v_size--;
 
       // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+      if ((is_int($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
@@ -1479,7 +1479,7 @@ function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_request
 
           // ----- Check the value
           $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
+          if ((!is_int($v_value)) || ($v_value<0)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
             return PclZip::errorCode();
           }
@@ -1646,7 +1646,7 @@ function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_request
               // ----- Parse items
               $v_work_list = explode(",", $p_options_list[$i+1]);
           }
-          else if (is_integer($p_options_list[$i+1])) {
+          else if (is_int($p_options_list[$i+1])) {
               $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
           }
           else if (is_array($p_options_list[$i+1])) {
@@ -1944,7 +1944,7 @@ function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requ
         break;
 
         case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
+          if (!is_int($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }