Update 5.4.2 (#3788)

* Fix crash in agent info if no URL

* Disable IP info

* Add new option for max-age header

* Rename the PHPCS file

* Remove deprecated ini_set

* Don’t double encode URLs when checking them

Although it worked, it looked like it didn’t

* Improve linting

* Update locale

* Update version

* Update PHP version info

* Bundle

* Set version

client/component/useragent/index.js

@@ -69,6 +69,10 @@ class Useragent extends React.Component {
 	}
 
 	getType( type, url ) {
+		if ( ! type ) {
+			return null;
+		}
+
 		const name = type.slice( 0, 1 ).toUpperCase() + type.slice( 1 );
 
 		if ( url ) {

client/page/logs/row-actions.js

@@ -2,15 +2,13 @@
  * External dependencies
  */
 
-import React from 'react';
 import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 
 import { RowActions, RowAction } from 'component/table/row-action';
-import GeoMapAction from 'component/log-page/log-actions/geo-map';
 import UseragentAction from 'component/log-page/log-actions/user-agent';
 import ExtraDataAction from 'component/log-page/log-actions/extra-data';
 
@@ -31,9 +29,9 @@ function LogRowActions( props ) {
 		</RowAction>
 	);
 
-	if ( ip ) {
-		menu.unshift( <GeoMapAction key="2" ip={ ip } /> );
-	}
+	// if ( ip ) {
+	// 	menu.unshift( <GeoMapAction key="2" ip={ ip } /> );
+	// }
 
 	if ( agent ) {
 		menu.unshift( <UseragentAction key="3" agent={ agent } /> );

client/page/logs404/row-actions.js

@@ -2,7 +2,6 @@
  * External dependencies
  */
 
-import React from 'react';
 import { connect } from 'react-redux';
 import { __ } from '@wordpress/i18n';
 
@@ -13,7 +12,6 @@ import { __ } from '@wordpress/i18n';
 import { RowActions, RowAction } from 'component/table/row-action';
 import { setFilter } from 'state/error/action';
 import { CAP_REDIRECT_MANAGE, CAP_404_DELETE, CAP_REDIRECT_ADD } from 'lib/capabilities';
-import GeoMapAction from 'component/log-page/log-actions/geo-map';
 import UseragentAction from 'component/log-page/log-actions/user-agent';
 import getCreateAction from './create-action';
 
@@ -53,9 +51,9 @@ function ErrorRowActions( props ) {
 		</RowAction>
 	);
 
-	if ( ip ) {
-		menu.unshift( <GeoMapAction key="2" ip={ ip } /> );
-	}
+	// if ( ip ) {
+	// 	menu.unshift( <GeoMapAction key="2" ip={ ip } /> );
+	// }
 
 	if ( agent ) {
 		menu.unshift( <UseragentAction key="3" agent={ agent } /> );

client/page/redirects/columns/index.js

@@ -21,7 +21,12 @@ function getServer( item ) {
 }
 
 function escapeUrl( url ) {
-	return encodeURIComponent( url ).replace( /%2F/gi, '/' );
+	let newUrl = encodeURIComponent( url ).replace( /%2F/gi, '/' );
+
+	newUrl = newUrl.replace( /%3F/gi, '?' );
+	newUrl = newUrl.replace( /%3D/gi, '=' );
+	newUrl = newUrl.replace( /%26/gi, '&' );
+	return newUrl;
 }
 
 export default function getColumns( row, rowParams, disabled, defaultFlags, group ) {

client/page/site/headers/header.js

@@ -63,6 +63,7 @@ const knownHeaders = {
 				'max-age=<expire-time>',
 				'max-age=<expire-time>; includeSubDomains',
 				'max-age=<expire-time>; preload',
+				'max-age=<expire-time>; includeSubDomains; preload',
 			] ),
 			replace: 'expire-time',
 			replaceType: 'integer',

composer.json

@@ -1,24 +1,29 @@
 {
-    "require-dev": {
-        "vimeo/psalm": "^3.14.2",
-        "yoast/phpunit-polyfills": "^1.0",
-        "wp-cli/wp-cli-bundle": "*",
-        "humanmade/psalm-plugin-wordpress": "^1.0",
-        "phpunit/phpunit": "^9.5",
-        "phpstan/phpstan": "^1.10",
-        "szepeviktor/phpstan-wordpress": "^1.3",
-        "phpstan/extension-installer": "^1.3"
-    },
-    "scripts": {
-        "pot": "wp i18n make-pot . locale/redirection.pot --ignore-domain --exclude=redirection-strings.php",
-        "json": "wp i18n make-json locale --purge",
-        "test": "./vendor/bin/phpunit",
-        "phpstan": "./vendor/bin/phpstan analyse --configuration=phpstan.neon"
-    },
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "phpstan/extension-installer": true
-        }
-    }
+	"require-dev": {
+		"vimeo/psalm": "^5.18",
+		"yoast/phpunit-polyfills": "^2.0",
+		"wp-cli/wp-cli-bundle": "^2.9",
+		"phpunit/phpunit": "^10.5",
+		"phpstan/phpstan": "^1.10",
+		"szepeviktor/phpstan-wordpress": "^1.3",
+		"phpstan/extension-installer": "^1.3",
+		"squizlabs/php_codesniffer": "^3.8",
+		"wp-coding-standards/wpcs": "^3.0",
+		"sirbrillig/phpcs-variable-analysis": "^2.11",
+		"sirbrillig/phpcs-no-get-current-user": "^1.1",
+		"phpcompatibility/php-compatibility": "^9.3"
+	},
+	"scripts": {
+		"pot": "wp i18n make-pot . locale/redirection.pot --ignore-domain --exclude=redirection-strings.php",
+		"json": "wp i18n make-json locale --purge",
+		"test": "./vendor/bin/phpunit",
+		"phpstan": "./vendor/bin/phpstan analyse --configuration=phpstan.neon",
+		"lint": "./vendor/bin/phpcs --standard=phpcs.xml --extensions=php --ignore=vendor ./models ./api ./actions ./modules ./matches ./fileio ./database ./*.php"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true,
+			"phpstan/extension-installer": true
+		}
+	}
 }