Skip to content

Commit c3e0af2

Browse files
pavelthqpavelthq
committed
VC-2957 update codestyle
1 parent b430b9d commit c3e0af2

18 files changed

+178
-142
lines changed

‎ci/ruleset.xml

+29-3
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,42 @@
111111
<rule ref="WordPress.Security.SafeRedirect"/>
112112
<rule ref="WordPress.Security.NonceVerification"/>
113113
<rule ref="WordPress.Security.EscapeOutput"/>
114-
<rule ref="WordPress.PHP.DevelopmentFunctions"/>
115-
<rule ref="WordPress.PHP.DiscouragedPHPFunctions"/>
114+
<rule ref="WordPress.PHP.DevelopmentFunctions">
115+
<exclude-pattern>./visualcomposer/Modules/System/Ajax/AdminController.php</exclude-pattern>
116+
<exclude-pattern>./visualcomposer/Modules/System/Ajax/Controller.php</exclude-pattern>
117+
<exclude-pattern>./visualcomposer/Modules/Assets/AssetBundleCompressionController.php</exclude-pattern>
118+
</rule>
119+
<!-- WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode exclude visualcomposer/Modules/Editors/DataUsage/Controller.php -->
120+
<rule ref="WordPress.PHP.DiscouragedPHPFunctions">
121+
<exclude-pattern>./visualcomposer/Modules/Editors/DataUsage/Controller.php</exclude-pattern>
122+
<exclude-pattern>./visualcomposer/Modules/Assets/AssetBundleCompressionController.php</exclude-pattern>
123+
<exclude-pattern>./visualcomposer/Modules/System/Ajax/AdminController.php</exclude-pattern>
124+
<exclude-pattern>./visualcomposer/Modules/System/Ajax/Controller.php</exclude-pattern>
125+
<exclude-pattern>./visualcomposer/Modules/Elements/Traits/AddShortcodeTrait.php</exclude-pattern>
126+
<exclude-pattern>./visualcomposer/Modules/Elements/Traits/ShortcodesTrait.php</exclude-pattern>
127+
<exclude-pattern>./visualcomposer/Modules/FrontView/FrontViewController.php</exclude-pattern>
128+
<exclude-pattern>./visualcomposer/Modules/Vendors/WpmlController.php</exclude-pattern>
129+
</rule>
116130
<rule ref="WordPress.WP.DeprecatedFunctions"/>
117131
<rule ref="WordPress.WP.DeprecatedClasses"/>
118132
<rule ref="WordPress.WP.DeprecatedParameters"/>
119133
<rule ref="WordPress.WP.DeprecatedParameterValues"/>
120134
<rule ref="WordPress.WP.AlternativeFunctions"/>
121135
<rule ref="WordPress.WP.DiscouragedConstants"/>
122136
<rule ref="WordPress.WP.DiscouragedFunctions"/>
123-
137+
<rule ref="WordPress.PHP.IniSet">
138+
<exclude-pattern>./visualcomposer/Modules/System/Ajax/AdminController.php</exclude-pattern>
139+
<exclude-pattern>./visualcomposer/Modules/System/Ajax/Controller.php</exclude-pattern>
140+
<exclude-pattern>./visualcomposer/Modules/Assets/AssetBundleCompressionController.php</exclude-pattern>
141+
</rule>
142+
<rule ref="Generic.PHP.BacktickOperator"/>
143+
<rule ref="Generic.PHP.Syntax"/>
144+
<rule ref="WordPress.WP.GlobalVariablesOverride"/>
145+
<rule ref="WordPress.PHP.NoSilencedErrors">
146+
<properties>
147+
<property name="usePHPFunctionsList" value="false"/>
148+
</properties>
149+
</rule>
124150
<file>./visualcomposer</file>
125151
<file>./bootstrap</file>
126152
<file>./plugin-wordpress.php</file>

‎composer.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
]
2222
},
2323
"require": {
24-
"ext-exif": "*"
24+
"ext-exif": "*",
25+
"ext-json": "*",
26+
"ext-curl": "*",
27+
"ext-zlib": "*"
2528
}
2629
}

‎visualcomposer/Framework/helpers.php

-4
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ function vcfilter($filter, $body = '', $payload = [], $haltable = false)
8282
* @param array $args
8383
*
8484
* @return string
85-
* @throws \VisualComposer\Framework\Illuminate\Container\BindingResolutionException
86-
* @throws \Exception
8785
*/
8886
function vcview($path, $args = [])
8987
{
@@ -94,8 +92,6 @@ function vcview($path, $args = [])
9492
/**
9593
* @param $path
9694
* @param array $args
97-
*
98-
* @throws \VisualComposer\Framework\Illuminate\Container\BindingResolutionException
9995
*/
10096
function evcview($path, $args = [])
10197
{

‎visualcomposer/Helpers/Globals.php

+20-6
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,31 @@
99
}
1010

1111
use VisualComposer\Framework\Illuminate\Support\Helper;
12-
use function VisualComposer\Framework\esc_html;
1312

14-
class Output implements Helper
13+
class Globals implements Helper
1514
{
16-
public function printNotEscaped($content)
15+
protected static $globalCache = [];
16+
17+
public function backup($prefix, $key)
18+
{
19+
self::$globalCache[ $prefix . '_' . $key ] = $GLOBALS[ $key ];
20+
}
21+
22+
public function set($key, $value)
23+
{
24+
$GLOBALS[ $key ] = $value;
25+
}
26+
27+
public function get($key)
1728
{
18-
echo esc_html($content);
29+
return $GLOBALS[ $key ];
1930
}
2031

21-
public function printEscaped($content)
32+
public function restore($prefix, $key)
2233
{
23-
echo \esc_html($content);
34+
if (isset(self::$globalCache[ $prefix . '_' . $key ])) {
35+
$GLOBALS[ $key ] = self::$globalCache[ $prefix . '_' . $key ];
36+
unset(self::$globalCache[ $prefix . '_' . $key ]); // clear memory leak
37+
}
2438
}
2539
}

‎visualcomposer/Helpers/PostType.php

+13-15
Original file line numberDiff line numberDiff line change
@@ -190,33 +190,31 @@ public function trash($id, $postType = '')
190190
*/
191191
public function setupPost($sourceId)
192192
{
193-
// @codingStandardsIgnoreStart
194-
global $post_type, $post_type_object, $post, $wp_query;
193+
global $wp_query;
195194
$queryPost = get_post($sourceId);
196-
195+
$globalsHelper = vchelper('Globals');
197196
if (
198197
isset($queryPost->post_type)
199198
&& post_type_exists($queryPost->post_type)
200199
) {
201-
$post = $queryPost;
202-
if ($post->post_title === __('Auto Draft')) {
203-
$post->post_title = sprintf('%s #%s', __('Visual Composer', 'visualcomposer'), $post->ID);
200+
$globalsHelper->set('post', $queryPost);
201+
if ($queryPost->post_title === __('Auto Draft')) {
202+
$queryPost->post_title = sprintf('%s #%s', __('Visual Composer', 'visualcomposer'), $queryPost->ID);
204203
}
205-
setup_postdata($post);
204+
setup_postdata($queryPost);
206205
/** @var \WP_Query $wp_query */
207-
$wp_query->queried_object = $post;
206+
$wp_query->queried_object = $queryPost;
208207
if (!isset($wp_query->posts)) {
209208
$wp_query->posts = [];
210209
}
211-
$wp_query->posts[0] = $post;
212-
$wp_query->post = $post;
213-
$wp_query->queried_object_id = $post->ID;
210+
$wp_query->posts[0] = $queryPost;
211+
$wp_query->post = $queryPost;
212+
$wp_query->queried_object_id = $queryPost->ID;
214213
$wp_query->is_singular = true;
215-
$post_type = $post->post_type;
216-
$post_type_object = get_post_type_object($post_type);
214+
$globalsHelper->set('post_type', $queryPost->post_type);
215+
$globalsHelper->set('post_type_object', get_post_type_object($queryPost->post_type));
217216

218-
// @codingStandardsIgnoreEnd
219-
return $post;
217+
return $queryPost;
220218
}
221219

222220
return false;

‎visualcomposer/Helpers/PostsGridPostIterator.php

+7-12
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,24 @@ public function __construct(GridItemTemplate $gridItemTemplateHelper)
3232
*/
3333
public function loopPosts($posts, $template)
3434
{
35-
// @codingStandardsIgnoreStart
36-
global $post, $shortcode_tags;
37-
38-
$backupTags = $shortcode_tags;
39-
// @codingStandardsIgnoreEnd
35+
$globalsHelper = vchelper('Globals');
36+
$globalsHelper->backup('loopPosts.backupTags', 'shortcode_tags');
37+
$globalsHelper->backup('loopPosts.post', 'post');
4038
remove_all_shortcodes();
41-
$backup = $post;
4239
$output = '';
4340
if (is_array($posts)) {
4441
foreach ($posts as $queryPost) {
45-
$post = $queryPost;
46-
setup_postdata($post);
42+
$globalsHelper->set('post', $queryPost);
43+
setup_postdata($queryPost);
4744
$compiledTemplate = $this->renderPost($template, $queryPost);
4845
$output .= trim($compiledTemplate);
4946
$output = vcfilter('vcv:frontend:content', $output);
5047
wp_reset_postdata();
5148
}
5249
}
53-
$post = $backup;
54-
// @codingStandardsIgnoreStart
55-
$shortcode_tags = $backupTags;
50+
$globalsHelper->restore('loopPosts.backupTags', 'shortcode_tags');
51+
$globalsHelper->restore('loopPosts.post', 'post');
5652

57-
// @codingStandardsIgnoreEnd
5853
return strip_shortcodes($output);
5954
}
6055

‎visualcomposer/Modules/Assets/EnqueueController.php

+19-21
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,14 @@ protected function enqueueAssetsFromList($payload, AssetsEnqueue $assetsEnqueueH
8686
if (vcvenv('ENQUEUE_INNER_ASSETS')) {
8787
return;
8888
}
89+
$globalsHelper = vchelper('Globals');
8990
VcvEnv::set('ENQUEUE_INNER_ASSETS', true);
9091
$printJs = !isset($payload['printJs']) || $payload['printJs'];
9192
$enqueueList = $assetsEnqueueHelper->getEnqueueList();
9293
if (!empty($enqueueList)) {
9394
foreach ($enqueueList as $sourceId) {
94-
// @codingStandardsIgnoreStart
95-
global $wp_query, $wp_the_query;
96-
$backup = $wp_query;
97-
$backupGlobal = $wp_the_query;
95+
$backup = $globalsHelper->get('wp_query');
96+
$backupGlobal = $globalsHelper->get('wp_the_query');
9897

9998
$tempPostQuery = new WP_Query(
10099
[
@@ -104,13 +103,13 @@ protected function enqueueAssetsFromList($payload, AssetsEnqueue $assetsEnqueueH
104103
'posts_per_page' => 1,
105104
]
106105
);
107-
$wp_query = $tempPostQuery;
106+
$globalsHelper->set('wp_query', $tempPostQuery);
108107
if (is_null(self::$initialPostId)) {
109108
self::$initialPostId = get_the_ID();
110109
}
111-
$wp_the_query = $tempPostQuery;
112-
if ($wp_query->have_posts()) {
113-
$wp_query->the_post();
110+
$globalsHelper->set('wp_the_query', $tempPostQuery);
111+
if ($tempPostQuery->have_posts()) {
112+
$tempPostQuery->the_post();
114113
$this->callNonWordpressActionCallbacks('wp_enqueue_scripts');
115114

116115
// queue of assets to be outputted later with print_late_styles() and do_action('wp_print_footer_script')
@@ -128,8 +127,8 @@ protected function enqueueAssetsFromList($payload, AssetsEnqueue $assetsEnqueueH
128127
}
129128
ob_end_clean();
130129
}
131-
$wp_query = $backup;
132-
$wp_the_query = $backupGlobal; // fix wp_reset_query
130+
$globalsHelper->set('wp_query', $backup);
131+
$globalsHelper->set('wp_the_query', $backupGlobal);
133132
// Remove from list only if printJs is true (footer side)
134133
if ($printJs) {
135134
$assetsEnqueueHelper->removeFromList($sourceId);
@@ -148,12 +147,14 @@ protected function enqueueAssetsFromList($payload, AssetsEnqueue $assetsEnqueueH
148147
*/
149148
protected function callNonWordpressActionCallbacks($action)
150149
{
151-
global $wp_filter, $wp_current_filter;
150+
global $wp_filter;
152151
// Run over actions sorted by priorities
153152
$actions = $wp_filter[ $action ]->callbacks;
154153
ksort($actions);
155-
// @codingStandardsIgnoreLine
156-
$wp_current_filter[] = $action;
154+
$globalsHelper = vchelper('Globals');
155+
$currentFilterCopy = $globalsHelper->get('wp_current_filter');
156+
$currentFilterCopy[] = $action;
157+
$globalsHelper->set('wp_current_filter', $currentFilterCopy);
157158
foreach ($actions as $callbacks) {
158159
// Run over callbacks
159160
foreach ($callbacks as $callback) {
@@ -181,8 +182,9 @@ protected function callNonWordpressActionCallbacks($action)
181182
call_user_func_array($callback['function'], ['']);
182183
}
183184
}
184-
// @codingStandardsIgnoreLine
185-
array_pop($wp_current_filter);
185+
$currentFilterCopy = $globalsHelper->get('wp_current_filter');
186+
array_pop($currentFilterCopy);
187+
$globalsHelper->set('wp_current_filter', $currentFilterCopy);
186188
}
187189

188190
protected function enqueueVcvAssets($sourceIds)
@@ -200,16 +202,15 @@ protected function enqueueNoscript()
200202

201203
protected function setCustomWpScripts()
202204
{
203-
// @codingStandardsIgnoreStart
204205
global $wp_scripts;
205206
$newScripts = new VcwbWpScripts();
206207
if (is_object($wp_scripts)) {
207208
foreach (get_object_vars($wp_scripts) as $key => $value) {
208209
$newScripts->{$key} = $value;
209210
}
210211
}
211-
$wp_scripts = $newScripts;
212-
// @codingStandardsIgnoreEnd
212+
$globalsHelper = vchelper('Globals');
213+
$globalsHelper->set('wp_scripts', $newScripts);
213214
}
214215

215216
/**
@@ -221,12 +222,9 @@ protected function enqueueAssetsVendorListener($sourceIds)
221222
return;
222223
}
223224

224-
// @codingStandardsIgnoreStart
225-
global $wp_query;
226225
if (is_null(self::$initialPostId)) {
227226
self::$initialPostId = get_the_ID();
228227
}
229-
// @codingStandardsIgnoreEnd
230228

231229
$sourceIds = array_unique($sourceIds);
232230
$this->enqueueAssetsBySourceList($sourceIds);

‎visualcomposer/Modules/Editors/Attributes/WpEditor.php

+4-8
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,8 @@ protected function addCustomTinymcePlugins($plugins)
7878

7979
protected function getWpEditor()
8080
{
81-
// @codingStandardsIgnoreStart
82-
global $wp_rich_edit;
83-
$wp_rich_edit = true;
84-
// @codingStandardsIgnoreEnd
81+
$globalsHelper = vchelper('Globals');
82+
$globalsHelper->set('wp_rich_edit', true);
8583
ob_start();
8684
$this->getEditorButtonStyles();
8785
/** @see \VisualComposer\Modules\Editors\Attributes\WpEditor::addCustomTinymcePlugins */
@@ -144,10 +142,8 @@ protected function getWpEditor()
144142

145143
protected function getWpEditorDynamic()
146144
{
147-
// @codingStandardsIgnoreStart
148-
global $wp_rich_edit;
149-
$wp_rich_edit = true;
150-
// @codingStandardsIgnoreEnd
145+
$globalsHelper = vchelper('Globals');
146+
$globalsHelper->set('wp_rich_edit', true);
151147
ob_start();
152148
$this->getEditorButtonStyles();
153149
wp_editor(

‎visualcomposer/Modules/Editors/Frontend/MenuController.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -142,20 +142,21 @@ protected function addLinkToSubmenu(
142142
UserCapabilities $userCapabilitiesHelper,
143143
Url $urlHelper
144144
) {
145-
global $submenu;
145+
$globalsHelper = vchelper('Globals');
146+
$submenuCopy = $globalsHelper->get('submenu');
146147
if ($userCapabilitiesHelper->isEditorEnabled($postType)) {
147148
foreach ($linksData as $linkIndex => $link) {
148149
$linkMatch = preg_match('/post-new.php(.*)?/', $link[2]);
149150
if ($linkMatch) {
150151
// Now we know the post_type and can check for "Add New"
151152
$newIndex = $linkIndex + 1;
152-
while (isset($submenu[ $key ][ $newIndex ])) {
153+
while (isset($submenuCopy[ $key ][ $newIndex ])) {
153154
$newIndex++;
154155
}
155156
$linkInfo = isset($link[3]) ? $link[3] : null;
156157
$linkClass = isset($link[4]) ? $link[4] : null;
157158
$linkClass .= ' vcv-dashboard-admin-menu--add';
158-
$submenu[ $key ][ $newIndex ] = [
159+
$submenuCopy[ $key ][ $newIndex ] = [
159160
__('Add New with Visual&nbsp;Composer', 'visualcomposer'),
160161
$link[1],
161162
vcfilter(
@@ -168,6 +169,7 @@ protected function addLinkToSubmenu(
168169
];
169170
}
170171
}
172+
$globalsHelper->set('submenu', $submenuCopy);
171173
}
172174
}
173175

0 commit comments

Comments
 (0)