Skip to content

Commit 3ae2774

Browse files
committed
Remove no-longer-needed Squiz.PHP.InnerFunctions.NotAllowed ignores. Seems the new rule is ok with function→class→function.
1 parent e3bcee3 commit 3ae2774

File tree

9 files changed

+10
-11
lines changed

9 files changed

+10
-11
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Significance: patch
22
Type: changed
3-
Comment: Replace `MediaWiki.Usage.NestedFunctions` with `Squiz.PHP.InnerFunctions`.
3+
Comment: Remove `MediaWiki.Usage.NestedFunctions`, `Squiz.PHP.InnerFunctions` is ok with function→class→function.
44

55

projects/packages/classic-theme-helper/src/content-options/customizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class Jetpack_Customize_Control_Title extends WP_Customize_Control {
7474
/**
7575
* Render the control's content.
7676
*/
77-
public function render_content() { // phpcs:ignore Squiz.PHP.InnerFunctions.NotAllowed
77+
public function render_content() {
7878
?>
7979
<span class="customize-control-title"><?php echo wp_kses_post( $this->label ); ?></span>
8080
<?php
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Significance: patch
22
Type: changed
3-
Comment: Replace `MediaWiki.Usage.NestedFunctions` with `Squiz.PHP.InnerFunctions`.
3+
Comment: Replace `MediaWiki.Usage.NestedFunctions` with `Squiz.PHP.InnerFunctions`. Remove some where `Squiz.PHP.InnerFunctions` is ok with function→class→function.
44

55

projects/packages/jetpack-mu-wpcom/src/features/custom-css/custom-css.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ class safecss extends csstidy_optimise { // phpcs:ignore
12281228
/**
12291229
* Optimises $css after parsing.
12301230
*/
1231-
public function postparse() { // phpcs:ignore Squiz.PHP.InnerFunctions.NotAllowed
1231+
public function postparse() {
12321232

12331233
/** This action is documented in modules/custom-css/custom-css.php */
12341234
do_action( 'csstidy_optimize_postparse', $this );
@@ -1239,7 +1239,7 @@ public function postparse() { // phpcs:ignore Squiz.PHP.InnerFunctions.NotAllowe
12391239
/**
12401240
* Optimises a sub-value.
12411241
*/
1242-
public function subvalue() { // phpcs:ignore Squiz.PHP.InnerFunctions.NotAllowed
1242+
public function subvalue() {
12431243

12441244
/** This action is documented in modules/custom-css/custom-css.php */
12451245
do_action( 'csstidy_optimize_subvalue', $this );
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Significance: patch
22
Type: other
3-
Comment: Replace `MediaWiki.Usage.NestedFunctions` with `Squiz.PHP.InnerFunctions`.
3+
Comment: Replace `MediaWiki.Usage.NestedFunctions` with `Squiz.PHP.InnerFunctions`. Remove some where `Squiz.PHP.InnerFunctions` is ok with function→class→function.
44

55

projects/plugins/jetpack/modules/custom-post-types/testimonial.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @package automattic/jetpack
66
*
77
* @phpcs:disable Generic.Files.OneObjectStructurePerFile.MultipleFound
8-
* @phpcs:disable Squiz.PHP.InnerFunctions.NotAllowed
98
*/
109

1110
// phpcs:disable Universal.Files.SeparateFunctionsFromOO.Mixed -- TODO: Move classes to appropriately-named class files.

projects/plugins/jetpack/modules/theme-tools/content-options/customizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class Jetpack_Customize_Control_Title extends WP_Customize_Control {
7575
/**
7676
* Render the control's content.
7777
*/
78-
public function render_content() { // phpcs:ignore Squiz.PHP.InnerFunctions.NotAllowed
78+
public function render_content() {
7979
?>
8080
<span class="customize-control-title"><?php echo wp_kses_post( $this->label ); ?></span>
8181
<?php
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Significance: patch
22
Type: changed
3-
Comment: Replace `MediaWiki.Usage.NestedFunctions` with `Squiz.PHP.InnerFunctions`.
3+
Comment: Remove `MediaWiki.Usage.NestedFunctions`, `Squiz.PHP.InnerFunctions` is ok with function→class→function.
44

55

projects/plugins/wpcomsh/footer-credit/footer-credit/customizer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class WP_Customize_Footercredit_Select extends WP_Customize_Control {
3333
/**
3434
* Enqueue scripts and styles.
3535
*/
36-
public function enqueue() { // phpcs:ignore Squiz.PHP.InnerFunctions.NotAllowed
36+
public function enqueue() {
3737
if ( ! apply_filters( 'wpcom_better_footer_credit_can_customize', true ) ) {
3838
wp_enqueue_script( 'footercredit-control', plugins_url( 'js/control.js', __FILE__ ), array( 'jquery' ), WPCOMSH_VERSION, true );
3939
wp_enqueue_style( 'footercredit-control-styles', plugins_url( 'css/control.css', __FILE__ ), array(), WPCOMSH_VERSION );
@@ -43,7 +43,7 @@ public function enqueue() { // phpcs:ignore Squiz.PHP.InnerFunctions.NotAllowed
4343
/**
4444
* Render Footer Credits settings in Customizer.
4545
*/
46-
public function render_content() { // phpcs:ignore Squiz.PHP.InnerFunctions.NotAllowed
46+
public function render_content() {
4747
?>
4848
<label>
4949
<?php if ( ! empty( $this->label ) ) : ?>

0 commit comments

Comments
 (0)