Merge pull request #5 from digifa/2.3.2.3

digifa · web-flow · commit 0dc8920c4a3d · 2024-10-18T13:06:27.000+02:00
v2.3.2.2
diff --git a/src/EventListener/RequestResponseListener.php b/src/EventListener/RequestResponseListener.php
@@ -153,8 +153,6 @@ public function handleResponse(ResponseEvent $event): void
         if ($this->needModifyResponse && $this->modifyResponseClosure instanceof \Closure) {
             $modifyClosure = $this->modifyResponseClosure;
             $event->setResponse($modifyClosure($this->deviceView, $event));
-
-            return;
         }
     }
 
diff --git a/src/Helper/DeviceView.php b/src/Helper/DeviceView.php
@@ -157,42 +157,54 @@ public function hasSwitchParam(): bool
         return $this->request && $this->request->query->has($this->switchParam);
     }
 
-    public function setView(string $view): void
+    public function setView(string $view): self
     {
         $this->viewType = $view;
+
+        return $this;
     }
 
     /**
      * Sets the full (desktop) view type.
      */
-    public function setFullView(): void
+    public function setFullView(): self
     {
         $this->viewType = self::VIEW_FULL;
+
+        return $this;
     }
 
-    public function setTabletView(): void
+    public function setTabletView(): self
     {
         $this->viewType = self::VIEW_TABLET;
+
+        return $this;
     }
 
-    public function setMobileView(): void
+    public function setMobileView(): self
     {
         $this->viewType = self::VIEW_MOBILE;
+
+        return $this;
     }
 
-    public function setNotMobileView(): void
+    public function setNotMobileView(): self
     {
         $this->viewType = self::VIEW_NOT_MOBILE;
+
+        return $this;
     }
 
     public function getRedirectConfig(): array
     {
         return $this->redirectConfig;
     }
 
-    public function setRedirectConfig(array $redirectConfig): void
+    public function setRedirectConfig(array $redirectConfig): self
     {
         $this->redirectConfig = $redirectConfig;
+
+        return $this;
     }
 
     /**
@@ -239,79 +251,95 @@ public function getCookieExpireDatetimeModifier(): string
         return $this->cookieExpireDatetimeModifier;
     }
 
-    public function setCookieExpireDatetimeModifier(string $cookieExpireDatetimeModifier): void
+    public function setCookieExpireDatetimeModifier(string $cookieExpireDatetimeModifier): self
     {
         $this->cookieExpireDatetimeModifier = $cookieExpireDatetimeModifier;
+
+        return $this;
     }
 
     public function getCookieKey(): string
     {
         return $this->cookieKey;
     }
 
-    public function setCookieKey(string $cookieKey): void
+    public function setCookieKey(string $cookieKey): self
     {
         $this->cookieKey = $cookieKey;
+
+        return $this;
     }
 
     public function getCookiePath(): string
     {
         return $this->cookiePath;
     }
 
-    public function setCookiePath(string $cookiePath): void
+    public function setCookiePath(string $cookiePath): self
     {
         $this->cookiePath = $cookiePath;
+
+        return $this;
     }
 
     public function getCookieDomain(): string
     {
         return $this->cookieDomain;
     }
 
-    public function setCookieDomain(string $cookieDomain): void
+    public function setCookieDomain(string $cookieDomain): self
     {
         $this->cookieDomain = $cookieDomain;
+
+        return $this;
     }
 
     public function isCookieSecure(): bool
     {
         return $this->cookieSecure;
     }
 
-    public function setCookieSecure(bool $cookieSecure): void
+    public function setCookieSecure(bool $cookieSecure): self
     {
         $this->cookieSecure = $cookieSecure;
+
+        return $this;
     }
 
     public function isCookieHttpOnly(): bool
     {
         return $this->cookieHttpOnly;
     }
 
-    public function setCookieHttpOnly(bool $cookieHttpOnly): void
+    public function setCookieHttpOnly(bool $cookieHttpOnly): self
     {
         $this->cookieHttpOnly = $cookieHttpOnly;
+
+        return $this;
     }
 
     public function isCookieRaw(): bool
     {
         return $this->cookieRaw;
     }
 
-    public function setCookieRaw(bool $cookieRaw = false): void
+    public function setCookieRaw(bool $cookieRaw = false): self
     {
         $this->cookieRaw = $cookieRaw;
+
+        return $this;
     }
 
     public function getCookieSameSite(): ?string
     {
         return $this->cookieSameSite;
     }
 
-    public function setCookieSameSite(?string $cookieSameSite = Cookie::SAMESITE_LAX): void
+    public function setCookieSameSite(?string $cookieSameSite = Cookie::SAMESITE_LAX): self
     {
         $this->cookieSameSite = $cookieSameSite;
+
+        return $this;
     }
 
     /**
@@ -343,9 +371,11 @@ public function getSwitchParam(): string
         return $this->switchParam;
     }
 
-    public function setSwitchParam(string $switchParam): void
+    public function setSwitchParam(string $switchParam): self
     {
         $this->switchParam = $switchParam;
+
+        return $this;
     }
 
     /**
diff --git a/src/Helper/DeviceViewInterface.php b/src/Helper/DeviceViewInterface.php
@@ -58,22 +58,22 @@ public function isNotMobileView(): bool;
      */
     public function hasSwitchParam(): bool;
 
-    public function setView(string $view): void;
+    public function setView(string $view): self;
 
     /**
      * Sets the full (desktop) view type.
      */
-    public function setFullView(): void;
+    public function setFullView(): self;
 
-    public function setTabletView(): void;
+    public function setTabletView(): self;
 
-    public function setMobileView(): void;
+    public function setMobileView(): self;
 
-    public function setNotMobileView(): void;
+    public function setNotMobileView(): self;
 
     public function getRedirectConfig(): array;
 
-    public function setRedirectConfig(array $redirectConfig): void;
+    public function setRedirectConfig(array $redirectConfig): self;
 
     /**
      * Retrieves a RedirectResponseWithCookie object based on the provided redirect URL.
@@ -87,35 +87,35 @@ public function getSwitchParamValue(): ?string;
 
     public function getCookieExpireDatetimeModifier(): string;
 
-    public function setCookieExpireDatetimeModifier(string $cookieExpireDatetimeModifier): void;
+    public function setCookieExpireDatetimeModifier(string $cookieExpireDatetimeModifier): self;
 
     public function getCookieKey(): string;
 
-    public function setCookieKey(string $cookieKey): void;
+    public function setCookieKey(string $cookieKey): self;
 
     public function getCookiePath(): string;
 
-    public function setCookiePath(string $cookiePath): void;
+    public function setCookiePath(string $cookiePath): self;
 
     public function getCookieDomain(): string;
 
-    public function setCookieDomain(string $cookieDomain): void;
+    public function setCookieDomain(string $cookieDomain): self;
 
     public function isCookieSecure(): bool;
 
-    public function setCookieSecure(bool $cookieSecure): void;
+    public function setCookieSecure(bool $cookieSecure): self;
 
     public function isCookieHttpOnly(): bool;
 
-    public function setCookieHttpOnly(bool $cookieHttpOnly): void;
+    public function setCookieHttpOnly(bool $cookieHttpOnly): self;
 
     public function isCookieRaw(): bool;
 
-    public function setCookieRaw(bool $cookieRaw = false): void;
+    public function setCookieRaw(bool $cookieRaw = false): self;
 
     public function getCookieSameSite(): ?string;
 
-    public function setCookieSameSite(?string $cookieSameSite = Cookie::SAMESITE_LAX): void;
+    public function setCookieSameSite(?string $cookieSameSite = Cookie::SAMESITE_LAX): self;
 
     /**
      * Modifies the Response for the specified device view.
@@ -135,5 +135,5 @@ public function getRedirectResponse(string $view, string $host, int $statusCode)
 
     public function getSwitchParam(): string;
 
-    public function setSwitchParam(string $switchParam): void;
+    public function setSwitchParam(string $switchParam): self;
 }
diff --git a/src/Twig/Extension/MobileDetectExtension.php b/src/Twig/Extension/MobileDetectExtension.php
@@ -82,7 +82,7 @@ public function getRules(): array
      *
      * @return string|float|null the version of the property we are trying to extract
      */
-    public function deviceVersion(string $propertyName, string $type = MobileDetector::VERSION_TYPE_STRING)
+    public function deviceVersion(string $propertyName, string $type = MobileDetector::VERSION_TYPE_STRING): string|float|null
     {
         return $this->mobileDetector->version($propertyName, $type) ?: null;
     }

Original file line number	Diff line number	Diff line change
`@@ -153,8 +153,6 @@ public function handleResponse(ResponseEvent $event): void`
`153`	`153`	`if ($this->needModifyResponse && $this->modifyResponseClosure instanceof \Closure) {`
`154`	`154`	`$modifyClosure = $this->modifyResponseClosure;`
`155`	`155`	`$event->setResponse($modifyClosure($this->deviceView, $event));`
`156`		`-`
`157`		`- return;`
`158`	`156`	`}`
`159`	`157`	`}`
`160`	`158`
Original file line number	Diff line number	Diff line change
`@@ -157,42 +157,54 @@ public function hasSwitchParam(): bool`
`157`	`157`	`return $this->request && $this->request->query->has($this->switchParam);`
`158`	`158`	`}`
`159`	`159`
`160`		`- public function setView(string $view): void`
	`160`	`+ public function setView(string $view): self`
`161`	`161`	`{`
`162`	`162`	`$this->viewType = $view;`
	`163`	`+`
	`164`	`+ return $this;`
`163`	`165`	`}`
`164`	`166`
`165`	`167`	`/**`
`166`	`168`	`* Sets the full (desktop) view type.`
`167`	`169`	`*/`
`168`		`- public function setFullView(): void`
	`170`	`+ public function setFullView(): self`
`169`	`171`	`{`
`170`	`172`	`$this->viewType = self::VIEW_FULL;`
	`173`	`+`
	`174`	`+ return $this;`
`171`	`175`	`}`
`172`	`176`
`173`		`- public function setTabletView(): void`
	`177`	`+ public function setTabletView(): self`
`174`	`178`	`{`
`175`	`179`	`$this->viewType = self::VIEW_TABLET;`
	`180`	`+`
	`181`	`+ return $this;`
`176`	`182`	`}`
`177`	`183`
`178`		`- public function setMobileView(): void`
	`184`	`+ public function setMobileView(): self`
`179`	`185`	`{`
`180`	`186`	`$this->viewType = self::VIEW_MOBILE;`
	`187`	`+`
	`188`	`+ return $this;`
`181`	`189`	`}`
`182`	`190`
`183`		`- public function setNotMobileView(): void`
	`191`	`+ public function setNotMobileView(): self`
`184`	`192`	`{`
`185`	`193`	`$this->viewType = self::VIEW_NOT_MOBILE;`
	`194`	`+`
	`195`	`+ return $this;`
`186`	`196`	`}`
`187`	`197`
`188`	`198`	`public function getRedirectConfig(): array`
`189`	`199`	`{`
`190`	`200`	`return $this->redirectConfig;`
`191`	`201`	`}`
`192`	`202`
`193`		`- public function setRedirectConfig(array $redirectConfig): void`
	`203`	`+ public function setRedirectConfig(array $redirectConfig): self`
`194`	`204`	`{`
`195`	`205`	`$this->redirectConfig = $redirectConfig;`
	`206`	`+`
	`207`	`+ return $this;`
`196`	`208`	`}`
`197`	`209`
`198`	`210`	`/**`
`@@ -239,79 +251,95 @@ public function getCookieExpireDatetimeModifier(): string`
`239`	`251`	`return $this->cookieExpireDatetimeModifier;`
`240`	`252`	`}`
`241`	`253`
`242`		`- public function setCookieExpireDatetimeModifier(string $cookieExpireDatetimeModifier): void`
	`254`	`+ public function setCookieExpireDatetimeModifier(string $cookieExpireDatetimeModifier): self`
`243`	`255`	`{`
`244`	`256`	`$this->cookieExpireDatetimeModifier = $cookieExpireDatetimeModifier;`
	`257`	`+`
	`258`	`+ return $this;`
`245`	`259`	`}`
`246`	`260`
`247`	`261`	`public function getCookieKey(): string`
`248`	`262`	`{`
`249`	`263`	`return $this->cookieKey;`
`250`	`264`	`}`
`251`	`265`
`252`		`- public function setCookieKey(string $cookieKey): void`
	`266`	`+ public function setCookieKey(string $cookieKey): self`
`253`	`267`	`{`
`254`	`268`	`$this->cookieKey = $cookieKey;`
	`269`	`+`
	`270`	`+ return $this;`
`255`	`271`	`}`
`256`	`272`
`257`	`273`	`public function getCookiePath(): string`
`258`	`274`	`{`
`259`	`275`	`return $this->cookiePath;`
`260`	`276`	`}`
`261`	`277`
`262`		`- public function setCookiePath(string $cookiePath): void`
	`278`	`+ public function setCookiePath(string $cookiePath): self`
`263`	`279`	`{`
`264`	`280`	`$this->cookiePath = $cookiePath;`
	`281`	`+`
	`282`	`+ return $this;`
`265`	`283`	`}`
`266`	`284`
`267`	`285`	`public function getCookieDomain(): string`
`268`	`286`	`{`
`269`	`287`	`return $this->cookieDomain;`
`270`	`288`	`}`
`271`	`289`
`272`		`- public function setCookieDomain(string $cookieDomain): void`
	`290`	`+ public function setCookieDomain(string $cookieDomain): self`
`273`	`291`	`{`
`274`	`292`	`$this->cookieDomain = $cookieDomain;`
	`293`	`+`
	`294`	`+ return $this;`
`275`	`295`	`}`
`276`	`296`
`277`	`297`	`public function isCookieSecure(): bool`
`278`	`298`	`{`
`279`	`299`	`return $this->cookieSecure;`
`280`	`300`	`}`
`281`	`301`
`282`		`- public function setCookieSecure(bool $cookieSecure): void`
	`302`	`+ public function setCookieSecure(bool $cookieSecure): self`
`283`	`303`	`{`
`284`	`304`	`$this->cookieSecure = $cookieSecure;`
	`305`	`+`
	`306`	`+ return $this;`
`285`	`307`	`}`
`286`	`308`
`287`	`309`	`public function isCookieHttpOnly(): bool`
`288`	`310`	`{`
`289`	`311`	`return $this->cookieHttpOnly;`
`290`	`312`	`}`
`291`	`313`
`292`		`- public function setCookieHttpOnly(bool $cookieHttpOnly): void`
	`314`	`+ public function setCookieHttpOnly(bool $cookieHttpOnly): self`
`293`	`315`	`{`
`294`	`316`	`$this->cookieHttpOnly = $cookieHttpOnly;`
	`317`	`+`
	`318`	`+ return $this;`
`295`	`319`	`}`
`296`	`320`
`297`	`321`	`public function isCookieRaw(): bool`
`298`	`322`	`{`
`299`	`323`	`return $this->cookieRaw;`
`300`	`324`	`}`
`301`	`325`
`302`		`- public function setCookieRaw(bool $cookieRaw = false): void`
	`326`	`+ public function setCookieRaw(bool $cookieRaw = false): self`
`303`	`327`	`{`
`304`	`328`	`$this->cookieRaw = $cookieRaw;`
	`329`	`+`
	`330`	`+ return $this;`
`305`	`331`	`}`
`306`	`332`
`307`	`333`	`public function getCookieSameSite(): ?string`
`308`	`334`	`{`
`309`	`335`	`return $this->cookieSameSite;`
`310`	`336`	`}`
`311`	`337`
`312`		`- public function setCookieSameSite(?string $cookieSameSite = Cookie::SAMESITE_LAX): void`
	`338`	`+ public function setCookieSameSite(?string $cookieSameSite = Cookie::SAMESITE_LAX): self`
`313`	`339`	`{`
`314`	`340`	`$this->cookieSameSite = $cookieSameSite;`
	`341`	`+`
	`342`	`+ return $this;`
`315`	`343`	`}`
`316`	`344`
`317`	`345`	`/**`
`@@ -343,9 +371,11 @@ public function getSwitchParam(): string`
`343`	`371`	`return $this->switchParam;`
`344`	`372`	`}`
`345`	`373`
`346`		`- public function setSwitchParam(string $switchParam): void`
	`374`	`+ public function setSwitchParam(string $switchParam): self`
`347`	`375`	`{`
`348`	`376`	`$this->switchParam = $switchParam;`
	`377`	`+`
	`378`	`+ return $this;`
`349`	`379`	`}`
`350`	`380`
`351`	`381`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function getRules(): array`
`82`	`82`	`*`
`83`	`83`	`* @return string\|float\|null the version of the property we are trying to extract`
`84`	`84`	`*/`
`85`		`- public function deviceVersion(string $propertyName, string $type = MobileDetector::VERSION_TYPE_STRING)`
	`85`	`+ public function deviceVersion(string $propertyName, string $type = MobileDetector::VERSION_TYPE_STRING): string\|float\|null`
`86`	`86`	`{`
`87`	`87`	`return $this->mobileDetector->version($propertyName, $type) ?: null;`
`88`	`88`	`}`