Merge branch 'develop' into feature/3.18

# Conflicts:
#	wp-rocket.php

composer.json

@@ -234,6 +234,8 @@
 			"@test-integration-pressidium"
 		],
 		"run-stan": "vendor/bin/phpstan analyze --memory-limit=2G --no-progress",
+		"run-stan-reset-baseline": "vendor/bin/phpstan analyze --memory-limit=2G --no-progress --generate-baseline",
+		"run-stan-test": "vendor/bin/phpstan analyze inc/Engine/Common/ExtractCSS/Subscriber.php --memory-limit=2G --no-progress --debug",
 		"install-codestandards": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run",
 		"phpcs": "phpcs --basepath=.",
 		"phpcs-changed": "./bin/phpcs-changed.sh",

inc/Engine/Common/JobManager/APIHandler/AbstractSafeAPIClient.php

@@ -65,7 +65,7 @@ private function send_request( $method, $params = [], $safe = false ) {
 
 		$transient_key = $this->get_transient_key();
 		if ( get_transient( $transient_key . '_timeout_active' ) ) {
-			return new WP_Error( 429, __( 'Too many requests.', 'rocket' ) );
+			return new WP_Error( 429, 'Too many requests.' );
 		}
 		// Get previous_expiration early to avoid multiple parallel requests increasing the expiration multiple times.
 		$previous_expiration = (int) get_transient( $transient_key . '_timeout' );
@@ -82,7 +82,7 @@ private function send_request( $method, $params = [], $safe = false ) {
 		$body = wp_remote_retrieve_body( $response );
 		if ( empty( $body ) || ( ! empty( $response['response']['code'] ) && 200 !== $response['response']['code'] ) ) {
 			$this->set_timeout_transients( $previous_expiration );
-			return new WP_Error( 500, __( 'Not valid response.', 'rocket' ) );
+			return new WP_Error( 500, 'Not valid response.' );
 		}
 
 		$this->delete_timeout_transients();
@@ -148,6 +148,6 @@ private function send_remote_request( $api_url, $method, $params, $safe ) {
 				return wp_safe_remote_post( $api_url, $params );
 		}
 
-		return new WP_Error( 400, __( 'Not valid request type.', 'rocket' ) );
+		return new WP_Error( 400, 'Not valid request type.' );
 	}
 }

licence-data.php

@@ -0,0 +1,18 @@
+<?php
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * You can edit this file, but it will be overwritten in the next update,
+ * it's an autogenerated file, depending on your account
+ * or you can define these values directly in your wp-config.php file
+ */
+
+// Your license KEY.
+if ( ! defined( 'WP_ROCKET_KEY' ) ) {
+	define( 'WP_ROCKET_KEY', '' );
+}
+
+// Your email, the one you used for the purchase.
+if ( ! defined( 'WP_ROCKET_EMAIL' ) ) {
+	define( 'WP_ROCKET_EMAIL', '' );
+}