Merge branch '2.x' into 3.x

opcachectl.install

@@ -36,7 +36,7 @@ function opcachectl_requirements($phase) {
 				$requirements['opcache_enabled']['description'] = Link::createFromRoute(t('see configuration'), 'opcachectl.report.config')->toString();
 
 				$requirements['opcache_reset_token']['title'] = t('opcachectl reset token');
-				$token = trim(\Drupal::service('config.factory')->get('opcachectl')->get('reset_token'));
+				$token = trim(\Drupal::service('config.factory')->get('opcachectl')->get('reset_token') ?? '');
 				if( !empty($token) ) {
 					$requirements['opcache_reset_token']['severity'] = REQUIREMENT_OK;
 					$requirements['opcache_reset_token']['value'] = t('Token to access :route is set.', [':route' => '/system/php-opcache/reset/{token}']);

src/Access/OpcacheCtlAccess.php

@@ -42,7 +42,7 @@ class OpcacheCtlAccess implements AccessInterface {
 	 */
 	public function __construct() {
 		$opcachectl_config = \Drupal::service('config.factory')->get('opcachectl');
-		$this->requestToken = trim($opcachectl_config->get('request_token'));
+		$this->requestToken = trim($opcachectl_config->get('request_token') ?? '');
 		$this->authorizedAddresses = $opcachectl_config->get('request_addr');
 	}
 
@@ -77,7 +77,7 @@ class OpcacheCtlAccess implements AccessInterface {
 		}
 		if (!empty($this->requestToken) && $request->query->has('token')) {
 			// Allow access if request contains correct token.
-			$token = trim($request->query->get('token'));
+			$token = trim($request->query->get('token') ?? '');
 			if($token == $this->requestToken) {
 				return AccessResult::allowed();
 			}

src/Controller/OpcacheCtlController.php

@@ -57,7 +57,7 @@ class OpcacheCtlController extends ControllerBase {
 	 */
 	public function __construct(LoggerChannelFactory $logger, ConfigFactoryInterface $config_factory) {
 		$this->logger = $logger->get('opcachectl');
-		$this->resetToken = trim($config_factory->get('opcachectl')->get('reset_token'));
+		$this->resetToken = trim($config_factory->get('opcachectl')->get('reset_token') ?? '');
 	}
 
 	/**