From ee2f82e93a90887920bf2b9b8899d6cf5d2fe5d6 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 11 Mar 2022 09:50:24 +0100
Subject: [PATCH] backports murph-skeleton

---
 core/Controller/Admin/AdminController.php            |  1 +
 .../RequestSecurityEventSubscriber.php               | 12 +++++-------
 core/Resources/assets/css/admin.scss                 | 10 ++++++++++
 core/Resources/views/admin/layout.html.twig          |  6 ++++++
 public/index.php                                     |  2 ++
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/core/Controller/Admin/AdminController.php b/core/Controller/Admin/AdminController.php
index 02d726e..2b18a27 100644
--- a/core/Controller/Admin/AdminController.php
+++ b/core/Controller/Admin/AdminController.php
@@ -32,6 +32,7 @@ abstract class AdminController extends AbstractController
         $parameters['section'] = $this->getSection();
         $parameters['site_name'] = $this->coreParameters['site']['name'];
         $parameters['site_logo'] = $this->coreParameters['site']['logo'];
+        $parameters['murph_version'] = defined('MURPH_VERSION') ? MURPH_VERSION : null;
 
         return parent::render($view, $parameters, $response);
     }
diff --git a/core/EventSubscriber/RequestSecurityEventSubscriber.php b/core/EventSubscriber/RequestSecurityEventSubscriber.php
index 6b7a934..00ede77 100644
--- a/core/EventSubscriber/RequestSecurityEventSubscriber.php
+++ b/core/EventSubscriber/RequestSecurityEventSubscriber.php
@@ -44,22 +44,20 @@ class RequestSecurityEventSubscriber implements EventSubscriberInterface
         }
 
         $operator = $node->getSecurityOperator();
-        $exception = new AccessDeniedException('Access denied');
-        $isAuthorized = false;
+        $exception = new AccessDeniedException('Access denied.');
 
         foreach ($roles as $role) {
             $isGranted = $this->authorizationChecker->isGranted($role);
 
             if ('or' === $operator && $isGranted) {
-                $isAuthorized = true;
-            } elseif ('and' === $operator && !$isGranted) {
+                return;
+            }
+            if ('and' === $operator && !$isGranted) {
                 throw $exception;
             }
         }
 
-        if (!$isAuthorized) {
-            throw $exception;
-        }
+        throw $exception;
     }
 
     public static function getSubscribedEvents(): array
diff --git a/core/Resources/assets/css/admin.scss b/core/Resources/assets/css/admin.scss
index 1fb41d1..7f40e65 100644
--- a/core/Resources/assets/css/admin.scss
+++ b/core/Resources/assets/css/admin.scss
@@ -546,3 +546,13 @@ form {
         line-height: normal;
     }
 }
+
+#murph-version {
+    display: inline;
+    font-size: 14px;
+    margin-left: 2px;
+
+    a {
+        color: #333;
+    }
+}
diff --git a/core/Resources/views/admin/layout.html.twig b/core/Resources/views/admin/layout.html.twig
index d8dd78f..e8694ee 100644
--- a/core/Resources/views/admin/layout.html.twig
+++ b/core/Resources/views/admin/layout.html.twig
@@ -22,6 +22,12 @@
 
             <div class="ml-auto">
                 {{ include('@Core/admin/module/account.html.twig') }}
+
+                {% if murph_version %}
+                    <div id="murph-version">
+                        <a href="https://doc.murph-project.org/" target="_blank">{{ murph_version }}</a>
+                    </div>
+                {% endif %}
             </div>
         </nav>
 
diff --git a/public/index.php b/public/index.php
index 3bcee0b..923c3a2 100644
--- a/public/index.php
+++ b/public/index.php
@@ -9,6 +9,8 @@ require dirname(__DIR__).'/vendor/autoload.php';
 
 (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
 
+define('MURPH_VERSION', 'v1.8.0');
+
 if ($_SERVER['APP_DEBUG']) {
     umask(0000);