Merge pull request #1252 from Codeinwp/bugfix/pro/519

Improved nonce creation

Author: vytisbulkevicius

classes/Visualizer/Gutenberg/Block.php

@@ -469,7 +469,7 @@ public function get_visualizer_data( $post ) {
 		}
 
 		if ( Visualizer_Module::is_pro() ) {
-			$permissions = get_post_meta( $post_id, Visualizer_PRO::CF_PERMISSIONS, true );
+			$permissions = get_post_meta( $post_id, Visualizer_Pro::CF_PERMISSIONS, true );
 
 			if ( empty( $permissions ) ) {
 				$permissions = array( 'permissions' => array(
@@ -664,7 +664,7 @@ public function update_chart_data( $data ) {
 			}
 
 			if ( Visualizer_Module::is_pro() ) {
-				update_post_meta( $data['id'], Visualizer_PRO::CF_PERMISSIONS, $data['visualizer-permissions'] );
+				update_post_meta( $data['id'], Visualizer_Pro::CF_PERMISSIONS, $data['visualizer-permissions'] );
 			}
 
 			if ( $data['visualizer-chart-url'] ) {

classes/Visualizer/Module/Setup.php

@@ -123,7 +123,7 @@ public function getUsage( $data, $meta_keys = array() ) {
 			}
 
 			if ( Visualizer_Module::is_pro() ) {
-				$permissions = get_post_meta( $chart_id, Visualizer_PRO::CF_PERMISSIONS, true );
+				$permissions = get_post_meta( $chart_id, Visualizer_Pro::CF_PERMISSIONS, true );
 				if ( empty( $permissions ) ) {
 					continue;
 				}

classes/Visualizer/Render/Layout.php

@@ -980,7 +980,7 @@ class="dashicons dashicons-lock"></span></h2>
 													add_query_arg(
 														array(
 															'action' => Visualizer_Module::is_pro() ? Visualizer_Pro::ACTION_FETCH_DATA : '',
-															'nonce'  => wp_create_nonce(),
+															'nonce'  => wp_create_nonce( Visualizer_Pro::ACTION_FETCH_DATA ),
 														),
 														admin_url( 'admin-ajax.php' )
 													)

phpstan-baseline.neon

@@ -1,11 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: '#^Access to constant CF_PERMISSIONS on an unknown class Visualizer_PRO\.$#'
-			identifier: class.notFound
-			count: 2
-			path: classes/Visualizer/Gutenberg/Block.php
-
 		-
 			message: '#^Call to function is_string\(\) with string will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -1608,12 +1602,6 @@ parameters:
 			count: 1
 			path: classes/Visualizer/Module/Language.php
 
-		-
-			message: '#^Access to constant CF_PERMISSIONS on an unknown class Visualizer_PRO\.$#'
-			identifier: class.notFound
-			count: 1
-			path: classes/Visualizer/Module/Setup.php
-
 		-
 			message: '#^Call to function is_null\(\) with array\{''administrator''\} will always evaluate to false\.$#'
 			identifier: function.impossibleType
@@ -2196,12 +2184,6 @@ parameters:
 			count: 1
 			path: classes/Visualizer/Render.php
 
-		-
-			message: '#^Access to constant ACTION_FETCH_DATA on an unknown class Visualizer_Pro\.$#'
-			identifier: class.notFound
-			count: 1
-			path: classes/Visualizer/Render/Layout.php
-
 		-
 			message: '#^Method Visualizer_Render_Layout\:\:_renderDbQuery\(\) has no return type specified\.$#'
 			identifier: missingType.return

phpstan.neon

@@ -5,6 +5,7 @@ parameters:
 		- %currentWorkingDirectory%/classes
 	bootstrapFiles:
 		- %currentWorkingDirectory%/tests/php/static-analysis-stubs/symbols.php
+		- %currentWorkingDirectory%/tests/php/static-analysis-stubs/visualizer-pro.php
 	scanDirectories:
 		- %currentWorkingDirectory%/vendor/neitanod/forceutf8
 		- %currentWorkingDirectory%/vendor/openspout/openspout

tests/php/static-analysis-stubs/visualizer-pro.php

@@ -0,0 +1,6 @@
+<?php
+
+class Visualizer_Pro {
+    const ACTION_FETCH_DATA = 'visualizer-fetch-data';
+    const CF_PERMISSIONS = 'visualizer-permissions';
+}