Move _menu_site_is_offine() into the Maintainance subscriber

1. +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
   @@ -30,7 +93,7 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
   -    $is_offline = _menu_site_is_offline() ? MENU_SITE_OFFLINE : MENU_SITE_ONLINE;
   +    $is_offline = $this->isSiteOffline($request) ? MENU_SITE_OFFLINE : MENU_SITE_ONLINE;
   

   what about also moving those constants here?

2. +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
   @@ -47,14 +110,62 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
   +            $this->drupalSetMessage($this->translation->translate('Operating in maintenance mode.'), 'status', FALSE);
   

   $this->t()

Looks good!

+++ b/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/EventSubscriber/MaintenanceModeSubscriber.php
@@ -25,8 +25,8 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
+    if ($request->attributes->get('_maintenance') == \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber::SITE_OFFLINE && $request->attributes->get('_system_path') == 'menu_login_callback') {
+      $request->attributes->set('_maintenance', \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber::SITE_ONLINE);

+++ b/core/modules/user/lib/Drupal/user/EventSubscriber/MaintenanceModeSubscriber.php
@@ -28,7 +28,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
+    if ($site_status == \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber::SITE_OFFLINE) {

@@ -46,12 +46,12 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
+            $request->attributes->set('_maintenance', \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber::SITE_ONLINE);
...
+              $request->attributes->set('_maintenance', \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber::SITE_ONLINE);

lets add use statements and make those less ugly, so i can rtbc this:P

1. +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
   @@ -44,17 +127,65 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
   +    if ($this->state->get('system.maintenance_mode')) {
   +      if ($this->account->hasPermission('access site in maintenance mode')) {
   +        // Ensure that the maintenance mode message is displayed only once
   +        // (allowing for page redirects) and specifically suppress its display on
   +        // the maintenance mode settings page.
   +        if ($request->attributes->get(RouteObjectInterface::ROUTE_NAME) != 'system.site_maintenance_mode') {
   

   That's three ifs that could be combined if desired. Only the fourth has an else...

2. +++ b/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/EventSubscriber/MaintenanceModeSubscriber.php
   @@ -25,8 +25,8 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
   +    if ($request->attributes->get('_maintenance') == \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber::SITE_OFFLINE && $request->attributes->get('_system_path') == 'menu_login_callback') {
   +      $request->attributes->set('_maintenance', \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber::SITE_ONLINE);
   
   +++ b/core/modules/user/lib/Drupal/user/EventSubscriber/MaintenanceModeSubscriber.php
   @@ -28,7 +28,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
   +    if ($site_status == \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber::SITE_OFFLINE) {
   
   @@ -46,12 +46,12 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
   +            $request->attributes->set('_maintenance', \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber::SITE_ONLINE);
   ...
   +              $request->attributes->set('_maintenance', \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber::SITE_ONLINE);
   

   I also think we should have a use statement, but it really is just preference.

1. +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
   @@ -44,17 +127,62 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
   +    if ($this->state->get('system.maintenance_mode') && $this->account->hasPermission('access site in maintenance mode')
   +      // Ensure that the maintenance mode message is displayed only once
   +      // (allowing for page redirects) and specifically suppress its display on
   +      // the maintenance mode settings page.
   +      && $request->attributes->get(RouteObjectInterface::ROUTE_NAME) != 'system.site_maintenance_mode') {
   

   Can we make this if more readable by assigning this check to each variable?
   so this ends up to be like:

   if ($is_maintanance && $can_access_maintance && !$is_maintenance_route) {
   
   }

2. +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
   @@ -44,17 +127,62 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
   +  protected function t($string, array $args = array(), array $options = array()) {
   

   this needs the StringTranslationTrait now

+++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -44,17 +130,55 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
+    if ($is_maintanance && $can_access_maintance && $is_maintenance_route) {

$is_maintenance_route should have NOT in front of it:)

Thanks!

1. +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
   @@ -44,17 +130,55 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
   +    $can_access_maintance = $this->account->hasPermission('access site in maintenance mode');
   +    $is_maintanance = $this->state->get('system.maintenance_mode');
   +    // Ensure that the maintenance mode message is displayed only once
   +    // (allowing for page redirects) and specifically suppress its display on
   +    // the maintenance mode settings page.
   +    $is_maintenance_route = $request->attributes->get(RouteObjectInterface::ROUTE_NAME) == 'system.site_maintenance_mode';
   +    if ($is_maintanance && $can_access_maintance && !$is_maintenance_route) {
   +      if ($this->account->hasPermission('administer site configuration')) {
   +        $this->drupalSetMessage($this->t('Operating in maintenance mode. <a href="@url">Go online.</a>', array('@url' => $this->urlGenerator->generate('system.site_maintenance_mode'))), 'status', FALSE);
   

   s/can_access_maintance/can_access_maintenance/

2. +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
   @@ -44,17 +130,55 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
   +  protected function isSiteOffline() {
   

   Should we make this isSiteInMaintenance or something? Not sure we really use 'offline' anywhere much now.

I am sorry, "maintenance" is a hard word:P

Should we make this isSiteInMaintenance or something? Not sure we really use 'offline' anywhere much now.

Dunno, the constants are named offline and online.
Its a protected method anyway so we can change its name anytime we want..
Also #2239005: Remove the '_maintenance' request attribute discuss about turning this thing to a standalone service, so we could figure out the naming there

33: 2214209-33.patch queued for re-testing.

33: 2214209-33.patch queued for re-testing.

But yeah the method is not touched by this patch

The method is introduced by the patch.

fine. lets rename it...lets also get rid of the translation property declaration since its registered in the trait

Reroll for #2247991: [May 27] Move all module code from …/lib/Drupal/… to …/src/… for PSR-4.

Committed/pushed to 8.x, thanks!