Completed
Pull Request — master (#2762)
by
unknown
48s
created
classes/controllers/FrmDashboardController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 		foreach ( $data as $key => $messages ) {
430 430
 			if ( in_array( $key, array( 'unread', 'dismissed' ), true ) ) {
431 431
 				foreach ( $messages as $key_msg => $message ) {
432
-					$data[ $key ][ $key_msg ]['cta'] = self::inbox_clean_messages_cta( $message['cta'] );
432
+					$data[$key][$key_msg]['cta'] = self::inbox_clean_messages_cta( $message['cta'] );
433 433
 				}
434 434
 			}
435 435
 		}
@@ -522,11 +522,11 @@  discard block
 block discarded – undo
522 522
 	private static function get_dashboard_options( $option_name = null ) {
523 523
 		$options = get_option( self::OPTION_META_NAME, array() );
524 524
 
525
-		if ( null !== $option_name && ! isset( $options[ $option_name ] ) ) {
525
+		if ( null !== $option_name && ! isset( $options[$option_name] ) ) {
526 526
 			return array();
527 527
 		}
528 528
 
529
-		return null !== $option_name ? $options[ $option_name ] : $options;
529
+		return null !== $option_name ? $options[$option_name] : $options;
530 530
 	}
531 531
 
532 532
 	/**
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 	 */
540 540
 	private static function update_dashboard_options( $data, $option_name ) {
541 541
 		$options                 = self::get_dashboard_options();
542
-		$options[ $option_name ] = $data;
542
+		$options[$option_name] = $data;
543 543
 		update_option( self::OPTION_META_NAME, $options, 'no' );
544 544
 	}
545 545
 
Please login to merge, or discard this patch.
phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/SimplifyIfReturnSniff.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -44,17 +44,17 @@  discard block
 block discarded – undo
44 44
 		$tokens = $phpcsFile->getTokens();
45 45
 
46 46
 		// Make sure this if has a scope (curly braces).
47
-		if ( ! isset( $tokens[ $stackPtr ]['scope_opener'] ) || ! isset( $tokens[ $stackPtr ]['scope_closer'] ) ) {
47
+		if ( ! isset( $tokens[$stackPtr]['scope_opener'] ) || ! isset( $tokens[$stackPtr]['scope_closer'] ) ) {
48 48
 			return;
49 49
 		}
50 50
 
51
-		$scopeOpener = $tokens[ $stackPtr ]['scope_opener'];
52
-		$scopeCloser = $tokens[ $stackPtr ]['scope_closer'];
51
+		$scopeOpener = $tokens[$stackPtr]['scope_opener'];
52
+		$scopeCloser = $tokens[$stackPtr]['scope_closer'];
53 53
 
54 54
 		// Check if the if block contains only a single return statement.
55 55
 		$firstStatement = $phpcsFile->findNext( T_WHITESPACE, $scopeOpener + 1, $scopeCloser, true );
56 56
 
57
-		if ( false === $firstStatement || $tokens[ $firstStatement ]['code'] !== T_RETURN ) {
57
+		if ( false === $firstStatement || $tokens[$firstStatement]['code'] !== T_RETURN ) {
58 58
 			return;
59 59
 		}
60 60
 
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
 		}
81 81
 
82 82
 		// Check for else/elseif - skip these.
83
-		if ( in_array( $tokens[ $afterIf ]['code'], array( T_ELSE, T_ELSEIF ), true ) ) {
83
+		if ( in_array( $tokens[$afterIf]['code'], array( T_ELSE, T_ELSEIF ), true ) ) {
84 84
 			return;
85 85
 		}
86 86
 
87 87
 		// Must be followed by a return statement.
88
-		if ( $tokens[ $afterIf ]['code'] !== T_RETURN ) {
88
+		if ( $tokens[$afterIf]['code'] !== T_RETURN ) {
89 89
 			return;
90 90
 		}
91 91
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 
113 113
 		// Get the condition and return values to check line length.
114 114
 		$conditionStart = $phpcsFile->findNext( T_OPEN_PARENTHESIS, $stackPtr + 1 );
115
-		$conditionEnd   = $tokens[ $conditionStart ]['parenthesis_closer'];
115
+		$conditionEnd   = $tokens[$conditionStart]['parenthesis_closer'];
116 116
 		$condition      = trim( $phpcsFile->getTokensAsString( $conditionStart + 1, $conditionEnd - $conditionStart - 1 ) );
117 117
 
118 118
 		$firstReturnValue  = trim( $phpcsFile->getTokensAsString( $firstStatement + 1, $returnEnd - $firstStatement - 1 ) );
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 		$isNegated = false;
123 123
 		$firstNonWs = $phpcsFile->findNext( T_WHITESPACE, $conditionStart + 1, $conditionEnd, true );
124 124
 
125
-		if ( false !== $firstNonWs && $tokens[ $firstNonWs ]['code'] === T_BOOLEAN_NOT ) {
125
+		if ( false !== $firstNonWs && $tokens[$firstNonWs]['code'] === T_BOOLEAN_NOT ) {
126 126
 			$isNegated = true;
127 127
 			// Get condition without the leading !
128 128
 			$condition = trim( $phpcsFile->getTokensAsString( $firstNonWs + 1, $conditionEnd - $firstNonWs - 1 ) );
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 			$phpcsFile->fixer->beginChangeset();
152 152
 
153 153
 			// Remove everything from the if to the second return's semicolon.
154
-			for ( $i = $stackPtr; $i <= $secondReturnEnd; $i++ ) {
154
+			for ( $i = $stackPtr; $i <= $secondReturnEnd; $i ++ ) {
155 155
 				$phpcsFile->fixer->replaceToken( $i, '' );
156 156
 			}
157 157
 
@@ -178,23 +178,23 @@  discard block
 block discarded – undo
178 178
 		$tokenCount = 0;
179 179
 		$hasComplex = false;
180 180
 
181
-		for ( $i = $returnStart + 1; $i < $returnEnd; $i++ ) {
182
-			if ( $tokens[ $i ]['code'] === T_WHITESPACE ) {
181
+		for ( $i = $returnStart + 1; $i < $returnEnd; $i ++ ) {
182
+			if ( $tokens[$i]['code'] === T_WHITESPACE ) {
183 183
 				continue;
184 184
 			}
185 185
 
186
-			++$tokenCount;
186
+			++ $tokenCount;
187 187
 
188 188
 			// Check for complex constructs that shouldn't be in a ternary.
189 189
 			$complexTokens = array(
190 190
 				T_CLOSURE,
191 191
 				T_FUNCTION,
192 192
 				T_CLASS,
193
-				T_ARRAY,       // array() syntax - could be long.
193
+				T_ARRAY, // array() syntax - could be long.
194 194
 				T_OPEN_SHORT_ARRAY, // [] syntax - could be long.
195 195
 			);
196 196
 
197
-			if ( in_array( $tokens[ $i ]['code'], $complexTokens, true ) ) {
197
+			if ( in_array( $tokens[$i]['code'], $complexTokens, true ) ) {
198 198
 				$hasComplex = true;
199 199
 				break;
200 200
 			}
@@ -218,22 +218,22 @@  discard block
 block discarded – undo
218 218
 		// Find the opening parenthesis of the if condition.
219 219
 		$openParen = $phpcsFile->findNext( T_OPEN_PARENTHESIS, $ifPtr + 1 );
220 220
 
221
-		if ( false === $openParen || ! isset( $tokens[ $openParen ]['parenthesis_closer'] ) ) {
221
+		if ( false === $openParen || ! isset( $tokens[$openParen]['parenthesis_closer'] ) ) {
222 222
 			return false;
223 223
 		}
224 224
 
225
-		$closeParen = $tokens[ $openParen ]['parenthesis_closer'];
225
+		$closeParen = $tokens[$openParen]['parenthesis_closer'];
226 226
 
227 227
 		// Count non-whitespace tokens in the condition.
228 228
 		$tokenCount = 0;
229 229
 		$hasComplex = false;
230 230
 
231
-		for ( $i = $openParen + 1; $i < $closeParen; $i++ ) {
232
-			if ( $tokens[ $i ]['code'] === T_WHITESPACE ) {
231
+		for ( $i = $openParen + 1; $i < $closeParen; $i ++ ) {
232
+			if ( $tokens[$i]['code'] === T_WHITESPACE ) {
233 233
 				continue;
234 234
 			}
235 235
 
236
-			++$tokenCount;
236
+			++ $tokenCount;
237 237
 
238 238
 			// Check for complex constructs.
239 239
 			$complexTokens = array(
@@ -241,12 +241,12 @@  discard block
 block discarded – undo
241 241
 				T_FUNCTION,
242 242
 				T_CLASS,
243 243
 				T_BOOLEAN_AND, // && - multiple conditions.
244
-				T_BOOLEAN_OR,  // || - multiple conditions.
244
+				T_BOOLEAN_OR, // || - multiple conditions.
245 245
 				T_LOGICAL_AND, // and.
246
-				T_LOGICAL_OR,  // or.
246
+				T_LOGICAL_OR, // or.
247 247
 			);
248 248
 
249
-			if ( in_array( $tokens[ $i ]['code'], $complexTokens, true ) ) {
249
+			if ( in_array( $tokens[$i]['code'], $complexTokens, true ) ) {
250 250
 				$hasComplex = true;
251 251
 				break;
252 252
 			}
Please login to merge, or discard this patch.