Remove config array for RAPSYSPACK_AGENT, RAPSYSPACK_REDIRECT, RAPSYSPACK_SCHEME...

[packbundle] / Context / RequestStackContext.php

diff --git a/Context/RequestStackContext.php b/Context/RequestStackContext.php
index 0421de7d96a352a4dcebd3202d7fd1400e343ea7..366e167c15f28581f154b2910e83622c99380973 100644 (file)
--- a/Context/RequestStackContext.php
+++ b/Context/RequestStackContext.php
@@ -18,24 +18,12 @@ use Symfony\Component\HttpFoundation\RequestStack;
  * {@inheritdoc}
  */
 class RequestStackContext extends BaseRequestStackContext {
  * {@inheritdoc}
  */
 class RequestStackContext extends BaseRequestStackContext {

-       //RequestStack instance
-       private $requestStack;
-
-       //Base path
-       private $basePath;
-

        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

-       public function __construct(RequestStack $requestStack, string $basePath = '', bool $secure = false) {
+       public function __construct(protected RequestStack $requestStack, protected string $basePath = '', protected bool $secure = false) {

                //Call parent constructor
                parent::__construct($requestStack, $basePath, $secure);
                //Call parent constructor
                parent::__construct($requestStack, $basePath, $secure);

-
-               //Set request stack
-               $this->requestStack = $requestStack;
-
-               //Set base path
-               $this->basePath = $basePath;

        }
 
        /**
        }
 
        /**


@@ -45,7 +33,7 @@ class RequestStackContext extends BaseRequestStackContext {
         */
        public function getBaseUrl(): string {
                //Without request
         */
        public function getBaseUrl(): string {
                //Without request

-               if (!$request = $this->requestStack->getMasterRequest()) {
+               if (!$request = $this->requestStack->getMainRequest()) {

                        //Return base path
                        return $this->basePath;
                }
                        //Return base path
                        return $this->basePath;
                }