Inspection of "Fix bug PHP 8" - w3designweb/laravel-cookie-consent - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 3755b9...34c9da )

by Michele

created 2022-05-20 14:48 UTC

Status

Indentation +49 added lines, -49 removed lines patch added patch discarded remove patch

@@ -8,27 +8,27 @@  discard block
 block discarded – undo
 
 class LaravelCookieConsent
 {
-	/**
-	 * Handle an incoming request.
-	 * @param $request
-	 * @param Closure $next
-	 *
-	 * @return LaravelCookieConsent|mixed
-	 * @throws Throwable
-	 */
-	public function handle($request, Closure $next)
-	{
-		$alreadyAccepted = array_key_exists(config('laravel-cookie-consent.cookie_name'), $request->cookie());
+    /**
+     * Handle an incoming request.
+     * @param $request
+     * @param Closure $next
+     *
+     * @return LaravelCookieConsent|mixed
+     * @throws Throwable
+     */
+    public function handle($request, Closure $next)
+    {
+        $alreadyAccepted = array_key_exists(config('laravel-cookie-consent.cookie_name'), $request->cookie());
         $cookieTypesAccepted = $this->getCookieTypesConsent($request);
-		$response = $next($request);
-		if (! $response instanceof Response) {
-			return $response;
-		}
-		if (! $this->containsBodyTag($response)) {
-			return $response;
-		}
-		return $this->addCookieConsentScriptToResponse($response, $alreadyAccepted, $cookieTypesAccepted);
-	}
+        $response = $next($request);
+        if (! $response instanceof Response) {
+            return $response;
+        }
+        if (! $this->containsBodyTag($response)) {
+            return $response;
+        }
+        return $this->addCookieConsentScriptToResponse($response, $alreadyAccepted, $cookieTypesAccepted);
+    }
 
     /**
      * Get the cookie preference for the user
@@ -45,16 +45,16 @@  discard block
 block discarded – undo
         return $cookieTypesConsent;
     }
 
-	/**
-	 * Check if the application contains body tag
-	 * @param Response $response
-	 *
-	 * @return bool
-	 */
-	protected function containsBodyTag(Response $response): bool
+    /**
+     * Check if the application contains body tag
+     * @param Response $response
+     *
+     * @return bool
+     */
+    protected function containsBodyTag(Response $response): bool
     {
-		return $this->getLastClosingBodyTagPosition($response->getContent()) != false;
-	}
+        return $this->getLastClosingBodyTagPosition($response->getContent()) != false;
+    }
 
     /**
      * Add cookie consent container to the response
@@ -66,27 +66,27 @@  discard block
 block discarded – undo
      * @return Response
      * @throws Throwable
      */
-	protected function addCookieConsentScriptToResponse(Response $response, $alreadyAccepted, $cookieTypesAccepted): Response
+    protected function addCookieConsentScriptToResponse(Response $response, $alreadyAccepted, $cookieTypesAccepted): Response
     {
-		$content = $response->getContent();
-		//if(!$alreadyAccepted) {
-			$closingBodyTagPosition = $this->getLastClosingBodyTagPosition($content);
-			$content = ''
-			           .substr($content, 0, $closingBodyTagPosition)
-			           .view('laravel-cookie-consent::_banner', ['alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted])->render()
-			           .substr($content, $closingBodyTagPosition);
-		//}
-		return $response->setContent($content);
-	}
+        $content = $response->getContent();
+        //if(!$alreadyAccepted) {
+            $closingBodyTagPosition = $this->getLastClosingBodyTagPosition($content);
+            $content = ''
+                        .substr($content, 0, $closingBodyTagPosition)
+                        .view('laravel-cookie-consent::_banner', ['alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted])->render()
+                        .substr($content, $closingBodyTagPosition);
+        //}
+        return $response->setContent($content);
+    }
 
-	/**
-	 * Get last closing body tag position
-	 * @param string $content
-	 *
-	 * @return int
-	 */
-	protected function getLastClosingBodyTagPosition(string $content = ''): int
+    /**
+     * Get last closing body tag position
+     * @param string $content
+     *
+     * @return int
+     */
+    protected function getLastClosingBodyTagPosition(string $content = ''): int
     {
-		return strripos($content, '</body>');
-	}
+        return strripos($content, '</body>');
+    }
 }

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -21,10 +21,10 @@  discard block
 block discarded – undo
 		$alreadyAccepted = array_key_exists(config('laravel-cookie-consent.cookie_name'), $request->cookie());
         $cookieTypesAccepted = $this->getCookieTypesConsent($request);
 		$response = $next($request);
-		if (! $response instanceof Response) {
+		if (!$response instanceof Response) {
 			return $response;
 		}
-		if (! $this->containsBodyTag($response)) {
+		if (!$this->containsBodyTag($response)) {
 			return $response;
 		}
 		return $this->addCookieConsentScriptToResponse($response, $alreadyAccepted, $cookieTypesAccepted);
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
      */
     public function getCookieTypesConsent($request): array
     {
-        $cookieTypesConsent = [];
-        foreach(config('laravel-cookie-consent.cookie_types') as $type => $cookie_name) {
-            if(array_key_exists($cookie_name, $request->cookie())) $cookieTypesConsent[] = $cookie_name;
+        $cookieTypesConsent = [ ];
+        foreach (config('laravel-cookie-consent.cookie_types') as $type => $cookie_name) {
+            if (array_key_exists($cookie_name, $request->cookie())) $cookieTypesConsent[ ] = $cookie_name;
         }
         return $cookieTypesConsent;
     }
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
 			$closingBodyTagPosition = $this->getLastClosingBodyTagPosition($content);
 			$content = ''
 			           .substr($content, 0, $closingBodyTagPosition)
-			           .view('laravel-cookie-consent::_banner', ['alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted])->render()
+			           .view('laravel-cookie-consent::_banner', [ 'alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted ])->render()
 			           .substr($content, $closingBodyTagPosition);
 		//}
 		return $response->setContent($content);

Please login to merge, or discard this patch.

config/config.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -43,7 +43,7 @@  discard block
 block discarded – undo
                     'um' => 'minutes'
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             'laravel_session' => [
                 'duration' => [
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
                     'um' => 'minutes'
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             // Laravel Cookie Consent
             $COOKIE_CONSENT_NAME => [
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
                     'um' => $COOKIE_LIFETIME_UM
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             $COOKIE_CONSENT_NAME.'_statistics' => [
                 'duration' => [
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
                     'um' => $COOKIE_LIFETIME_UM
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             $COOKIE_CONSENT_NAME.'_marketing' => [
                 'duration' => [
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
                     'um' => $COOKIE_LIFETIME_UM
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             $COOKIE_CONSENT_NAME.'_functions' => [
                 'duration' => [
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
                     'um' => $COOKIE_LIFETIME_UM
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             // Insert your necessary cookie here
         ],

Please login to merge, or discard this patch.

		@@ -8,27 +8,27 @@ discard block
		block discarded – undo
8	8
9	9	class LaravelCookieConsent
10	10	{
11		- /**
12		- * Handle an incoming request.
13		- * @param $request
14		- * @param Closure $next
15		- *
16		- * @return LaravelCookieConsent\|mixed
17		- * @throws Throwable
18		- */
19		- public function handle($request, Closure $next)
20		- {
21		- $alreadyAccepted = array_key_exists(config('laravel-cookie-consent.cookie_name'), $request->cookie());
	11	+ /**
	12	+ * Handle an incoming request.
	13	+ * @param $request
	14	+ * @param Closure $next
	15	+ *
	16	+ * @return LaravelCookieConsent\|mixed
	17	+ * @throws Throwable
	18	+ */
	19	+ public function handle($request, Closure $next)
	20	+ {
	21	+ $alreadyAccepted = array_key_exists(config('laravel-cookie-consent.cookie_name'), $request->cookie());
22	22	$cookieTypesAccepted = $this->getCookieTypesConsent($request);
23		- $response = $next($request);
24		- if (! $response instanceof Response) {
25		- return $response;
26		- }
27		- if (! $this->containsBodyTag($response)) {
28		- return $response;
29		- }
30		- return $this->addCookieConsentScriptToResponse($response, $alreadyAccepted, $cookieTypesAccepted);
31		- }
	23	+ $response = $next($request);
	24	+ if (! $response instanceof Response) {
	25	+ return $response;
	26	+ }
	27	+ if (! $this->containsBodyTag($response)) {
	28	+ return $response;
	29	+ }
	30	+ return $this->addCookieConsentScriptToResponse($response, $alreadyAccepted, $cookieTypesAccepted);
	31	+ }
32	32
33	33	/**
34	34	* Get the cookie preference for the user
		@@ -45,16 +45,16 @@ discard block
		block discarded – undo
45	45	return $cookieTypesConsent;
46	46	}
47	47
48		- /**
49		- * Check if the application contains body tag
50		- * @param Response $response
51		- *
52		- * @return bool
53		- */
54		- protected function containsBodyTag(Response $response): bool
	48	+ /**
	49	+ * Check if the application contains body tag
	50	+ * @param Response $response
	51	+ *
	52	+ * @return bool
	53	+ */
	54	+ protected function containsBodyTag(Response $response): bool
55	55	{
56		- return $this->getLastClosingBodyTagPosition($response->getContent()) != false;
57		- }
	56	+ return $this->getLastClosingBodyTagPosition($response->getContent()) != false;
	57	+ }
58	58
59	59	/**
60	60	* Add cookie consent container to the response
		@@ -66,27 +66,27 @@ discard block
		block discarded – undo
66	66	* @return Response
67	67	* @throws Throwable
68	68	*/
69		- protected function addCookieConsentScriptToResponse(Response $response, $alreadyAccepted, $cookieTypesAccepted): Response
	69	+ protected function addCookieConsentScriptToResponse(Response $response, $alreadyAccepted, $cookieTypesAccepted): Response
70	70	{
71		- $content = $response->getContent();
72		- //if(!$alreadyAccepted) {
73		- $closingBodyTagPosition = $this->getLastClosingBodyTagPosition($content);
74		- $content = ''
75		- .substr($content, 0, $closingBodyTagPosition)
76		- .view('laravel-cookie-consent::_banner', ['alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted])->render()
77		- .substr($content, $closingBodyTagPosition);
78		- //}
79		- return $response->setContent($content);
80		- }
	71	+ $content = $response->getContent();
	72	+ //if(!$alreadyAccepted) {
	73	+ $closingBodyTagPosition = $this->getLastClosingBodyTagPosition($content);
	74	+ $content = ''
	75	+ .substr($content, 0, $closingBodyTagPosition)
	76	+ .view('laravel-cookie-consent::_banner', ['alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted])->render()
	77	+ .substr($content, $closingBodyTagPosition);
	78	+ //}
	79	+ return $response->setContent($content);
	80	+ }
81	81
82		- /**
83		- * Get last closing body tag position
84		- * @param string $content
85		- *
86		- * @return int
87		- */
88		- protected function getLastClosingBodyTagPosition(string $content = ''): int
	82	+ /**
	83	+ * Get last closing body tag position
	84	+ * @param string $content
	85	+ *
	86	+ * @return int
	87	+ */
	88	+ protected function getLastClosingBodyTagPosition(string $content = ''): int
89	89	{
90		- return strripos($content, '</body>');
91		- }
	90	+ return strripos($content, '</body>');
	91	+ }
92	92	}

		@@ -21,10 +21,10 @@ discard block
		block discarded – undo
21	21	$alreadyAccepted = array_key_exists(config('laravel-cookie-consent.cookie_name'), $request->cookie());
22	22	$cookieTypesAccepted = $this->getCookieTypesConsent($request);
23	23	$response = $next($request);
24		- if (! $response instanceof Response) {
	24	+ if (!$response instanceof Response) {
25	25	return $response;
26	26	}
27		- if (! $this->containsBodyTag($response)) {
	27	+ if (!$this->containsBodyTag($response)) {
28	28	return $response;
29	29	}
30	30	return $this->addCookieConsentScriptToResponse($response, $alreadyAccepted, $cookieTypesAccepted);
		@@ -38,9 +38,9 @@ discard block
		block discarded – undo
38	38	*/
39	39	public function getCookieTypesConsent($request): array
40	40	{
41		- $cookieTypesConsent = [];
42		- foreach(config('laravel-cookie-consent.cookie_types') as $type => $cookie_name) {
43		- if(array_key_exists($cookie_name, $request->cookie())) $cookieTypesConsent[] = $cookie_name;
	41	+ $cookieTypesConsent = [ ];
	42	+ foreach (config('laravel-cookie-consent.cookie_types') as $type => $cookie_name) {
	43	+ if (array_key_exists($cookie_name, $request->cookie())) $cookieTypesConsent[ ] = $cookie_name;
44	44	}
45	45	return $cookieTypesConsent;
46	46	}
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	$closingBodyTagPosition = $this->getLastClosingBodyTagPosition($content);
74	74	$content = ''
75	75	.substr($content, 0, $closingBodyTagPosition)
76		- .view('laravel-cookie-consent::_banner', ['alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted])->render()
	76	+ .view('laravel-cookie-consent::_banner', [ 'alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted ])->render()
77	77	.substr($content, $closingBodyTagPosition);
78	78	//}
79	79	return $response->setContent($content);

		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	'um' => 'minutes'
44	44	],
45	45	'provider' => env('APP_NAME'),
46		- 'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
	46	+ 'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
47	47	],
48	48	'laravel_session' => [
49	49	'duration' => [
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51	'um' => 'minutes'
52	52	],
53	53	'provider' => env('APP_NAME'),
54		- 'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
	54	+ 'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
55	55	],
56	56	// Laravel Cookie Consent
57	57	$COOKIE_CONSENT_NAME => [
		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	'um' => $COOKIE_LIFETIME_UM
61	61	],
62	62	'provider' => env('APP_NAME'),
63		- 'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
	63	+ 'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
64	64	],
65	65	$COOKIE_CONSENT_NAME.'_statistics' => [
66	66	'duration' => [
		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	'um' => $COOKIE_LIFETIME_UM
69	69	],
70	70	'provider' => env('APP_NAME'),
71		- 'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
	71	+ 'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
72	72	],
73	73	$COOKIE_CONSENT_NAME.'_marketing' => [
74	74	'duration' => [
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	'um' => $COOKIE_LIFETIME_UM
77	77	],
78	78	'provider' => env('APP_NAME'),
79		- 'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
	79	+ 'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
80	80	],
81	81	$COOKIE_CONSENT_NAME.'_functions' => [
82	82	'duration' => [
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	'um' => $COOKIE_LIFETIME_UM
85	85	],
86	86	'provider' => env('APP_NAME'),
87		- 'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
	87	+ 'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
88	88	],
89	89	// Insert your necessary cookie here
90	90	],

w3designweb / laravel-cookie-consent

Push — master ( 3755b9...34c9da )

Status

Category

Indentation +49 added lines, -49 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch