Phan: Address PhanPluginDuplicateConditionalNullCoalescing violations (#48887)

Author: tbradsha

projects/packages/analyzer/.phan/baseline.php

@@ -12,7 +12,6 @@
     // PhanUndeclaredProperty : 25+ occurrences
     // PhanTypeMismatchArgument : 8 occurrences
     // PhanParamSignatureMismatch : 6 occurrences
-    // PhanPluginDuplicateConditionalNullCoalescing : 6 occurrences
     // PhanTypeMismatchReturnProbablyReal : 6 occurrences
     // PhanUndeclaredClassMethod : 6 occurrences
     // PhanUndeclaredMethod : 6 occurrences
@@ -28,10 +27,10 @@
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
         'data/example-external.php' => ['PhanUndeclaredClassMethod', 'PhanUndeclaredClassStaticProperty', 'PhanUndeclaredFunction'],
-        'scripts/core-calls.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchDeclaredParam', 'PhanUndeclaredClassMethod', 'PhanUndeclaredTypeParameter'],
-        'scripts/core-definitions.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchDeclaredParam', 'PhanUndeclaredClassMethod', 'PhanUndeclaredTypeParameter'],
+        'scripts/core-calls.php' => ['PhanTypeMismatchDeclaredParam', 'PhanUndeclaredClassMethod', 'PhanUndeclaredTypeParameter'],
+        'scripts/core-definitions.php' => ['PhanTypeMismatchDeclaredParam', 'PhanUndeclaredClassMethod', 'PhanUndeclaredTypeParameter'],
         'scripts/example.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'scripts/jetpack-svn.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeArraySuspiciousNullable'],
+        'scripts/jetpack-svn.php' => ['PhanTypeArraySuspiciousNullable'],
         'src/Differences/class-class-const-missing.php' => ['PhanParamSignatureMismatch', 'PhanTypeMismatchArgument', 'PhanTypeMismatchReturnProbablyReal'],
         'src/Differences/class-class-const-moved.php' => ['PhanTypeMismatchArgument'],
         'src/Differences/class-class-method-deprecated.php' => ['PhanParamSignatureMismatch', 'PhanTypeMismatchReturnProbablyReal'],

projects/packages/analyzer/changelog/fix-phan-PhanPluginDuplicateConditionalNullCoalescing

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Phan: Address PhanPluginDuplicateConditionalNullCoalescing violations.

projects/packages/analyzer/scripts/core-calls.php

@@ -24,8 +24,8 @@ class CoreCalls {
 	 */
 	public static function callback( Event $event ) {
 		$arguments = $event->getArguments();
-		$scan_path = isset( $arguments[0] ) ? $arguments[0] : null;
-		$core_path = isset( $arguments[1] ) ? $arguments[1] : null;
+		$scan_path = $arguments[0] ?? null;
+		$core_path = $arguments[1] ?? null;
 		$io        = $event->getIO();
 
 		if (

projects/packages/analyzer/scripts/core-definitions.php

@@ -23,7 +23,7 @@ class CoreDefinitions {
 	 */
 	public static function callback( Event $event ) {
 		$arguments = $event->getArguments();
-		$scan_path = isset( $arguments[0] ) ? $arguments[0] : null;
+		$scan_path = $arguments[0] ?? null;
 		$io        = $event->getIO();
 
 		if ( is_null( $scan_path ) ) {

projects/packages/analyzer/scripts/jetpack-svn.php

@@ -24,9 +24,9 @@
 require dirname( __DIR__ ) . '/vendor/autoload.php';
 
 // Args.
-$external_repo_path = isset( $argv[1] ) ? $argv[1] : '/path/to/workspace/a8c/some-repo';
-$from_version       = isset( $argv[2] ) ? $argv[2] : ''; // Defaults to latest stable version in wp.org svn.
-$to_version         = isset( $argv[3] ) ? $argv[3] : 'trunk';
+$external_repo_path = $argv[1] ?? '/path/to/workspace/a8c/some-repo';
+$from_version       = $argv[2] ?? ''; // Defaults to latest stable version in wp.org svn.
+$to_version         = $argv[3] ?? 'trunk';
 
 if ( ! file_exists( $external_repo_path ) ) {
 	echo "Need a path of another codebase to compare Jetpack changes against.\n";

projects/packages/blocks/.phan/baseline.php

@@ -11,12 +11,11 @@
     // # Issue statistics:
     // PhanTypeMismatchArgument : 2 occurrences
     // PhanDeprecatedFunction : 1 occurrence
-    // PhanPluginDuplicateConditionalNullCoalescing : 1 occurrence
     // PhanTypeMismatchArgumentNullableInternal : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
-        'src/class-blocks.php' => ['PhanDeprecatedFunction', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchArgumentNullableInternal'],
+        'src/class-blocks.php' => ['PhanDeprecatedFunction', 'PhanTypeMismatchArgumentNullableInternal'],
         'tests/php/Blocks_Test.php' => ['PhanTypeMismatchArgument'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.

projects/packages/blocks/changelog/fix-phan-PhanPluginDuplicateConditionalNullCoalescing

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Phan: Address PhanPluginDuplicateConditionalNullCoalescing violations.

projects/packages/blocks/src/class-blocks.php

@@ -155,7 +155,7 @@ private static function get_block_metadata( $arg ) {
 			}
 		}
 
-		return isset( $metadata ) ? $metadata : array();
+		return $metadata ?? array();
 	}
 
 	/**

projects/packages/compat/.phan/baseline.php

@@ -10,12 +10,11 @@
 return [
     // # Issue statistics:
     // PhanDeprecatedFunction : 1 occurrence
-    // PhanPluginDuplicateConditionalNullCoalescing : 1 occurrence
     // PhanTypeMismatchProperty : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
-        'lib/locales.php' => ['PhanDeprecatedFunction', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchProperty'],
+        'lib/locales.php' => ['PhanDeprecatedFunction', 'PhanTypeMismatchProperty'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.
     // (directory_suppressions will currently be ignored by subsequent calls to --save-baseline, but may be preserved in future Phan releases)

projects/packages/compat/changelog/fix-phan-PhanPluginDuplicateConditionalNullCoalescing

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Phan: Address PhanPluginDuplicateConditionalNullCoalescing violations.