Merge pull request #137 from takeuji/master-request-deprecated-fix

Symfony5.3からdeprecatedなgetMasterRequestをgetMainRequestに変更
EC-CUBE · Aug 31, 2022 · 52ed04d · 52ed04d
2 parents d571d7b + 69fa3e3
commit 52ed04d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/EventListener/AuthorizationRequestResolveListener.php b/EventListener/AuthorizationRequestResolveListener.php
@@ -56,7 +56,7 @@ public static function getSubscribedEvents(): array
     public function onAuthorizationRequestResolve(AuthorizationRequestResolveEvent $event): void
     {
         $user = $event->getUser();
-        $request = $this->requestStack->getMasterRequest();
+        $request = $this->requestStack->getMainRequest();
 
         // システム管理者以外は承認しない
         if (!$user instanceof Member || $user->getAuthority()->getId() !== Authority::ADMIN) {

diff --git a/Service/WebHookService.php b/Service/WebHookService.php
@@ -62,7 +62,7 @@ public static function getSubscribedEvents()
 
     public function fire(ResponseEvent $event)
     {
-        if (!$event->isMasterRequest()) {
+        if (!$event->isMainRequest()) {
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ public static function getSubscribedEvents() @@
         public function fire(ResponseEvent $event)
         {
-            if (!$event->isMasterRequest()) {
+            if (!$event->isMainRequest()) {
                 return;
             }
@@ Expand Down @@