dependencies-upgrade

This commit is contained in:
RafficMohammed
2023-01-08 02:20:59 +05:30
parent 7870479b18
commit 49021a4497
1711 changed files with 74994 additions and 70803 deletions

View File

@@ -3,6 +3,9 @@
namespace Laravel\Dusk\Concerns;
use DateTimeInterface;
use Facebook\WebDriver\Exception\NoSuchCookieException;
use Illuminate\Cookie\CookieValuePrefix;
use Illuminate\Support\Facades\Crypt;
trait InteractsWithCookies
{
@@ -13,7 +16,7 @@ trait InteractsWithCookies
* @param string|null $value
* @param int|DateTimeInterface|null $expiry
* @param array $options
* @return string
* @return $this|string
*/
public function cookie($name, $value = null, $expiry = null, array $options = [])
{
@@ -21,19 +24,29 @@ trait InteractsWithCookies
return $this->addCookie($name, $value, $expiry, $options);
}
if ($cookie = $this->driver->manage()->getCookieNamed($name)) {
return decrypt(rawurldecode($cookie['value']), $unserialize = false);
try {
$cookie = $this->driver->manage()->getCookieNamed($name);
} catch (NoSuchCookieException $e) {
$cookie = null;
}
if ($cookie) {
$decryptedValue = decrypt(rawurldecode($cookie['value']), $unserialize = false);
$hasValuePrefix = strpos($decryptedValue, CookieValuePrefix::create($name, Crypt::getKey())) === 0;
return $hasValuePrefix ? CookieValuePrefix::remove($decryptedValue) : $decryptedValue;
}
}
/**
* Get or set a plain cookie's value.
* Get or set an unencrypted cookie's value.
*
* @param string $name
* @param string|null $value
* @param int|DateTimeInterface|null $expiry
* @param array $options
* @return string
* @return $this|string
*/
public function plainCookie($name, $value = null, $expiry = null, array $options = [])
{
@@ -41,7 +54,13 @@ trait InteractsWithCookies
return $this->addCookie($name, $value, $expiry, $options, false);
}
if ($cookie = $this->driver->manage()->getCookieNamed($name)) {
try {
$cookie = $this->driver->manage()->getCookieNamed($name);
} catch (NoSuchCookieException $e) {
$cookie = null;
}
if ($cookie) {
return rawurldecode($cookie['value']);
}
}
@@ -59,7 +78,9 @@ trait InteractsWithCookies
public function addCookie($name, $value, $expiry = null, array $options = [], $encrypt = true)
{
if ($encrypt) {
$value = encrypt($value, $serialize = false);
$prefix = CookieValuePrefix::create($name, Crypt::getKey());
$value = encrypt($prefix.$value, $serialize = false);
}
if ($expiry instanceof DateTimeInterface) {