Merge remote-tracking branch 'origin/master' into fix/254/allow_jpcrm…

…_versions
Automattic · Apr 19, 2022 · 20e9ac1 · 20e9ac1
2 parents 5b67c0c + eb3b75a
commit 20e9ac1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -17,6 +17,9 @@
 		"test": "vendor/bin/phpunit"
 	},
 	"config": {
-		"sort-packages": true
+		"sort-packages": true,
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }
diff --git a/features/jetpack-beta.php b/features/jetpack-beta.php
@@ -75,7 +75,7 @@ function ( &$app = null, $features, $domain ) use ( $defaults ) {
 
 				if ( $features['branches'] ) {
 					foreach ( $features['branches'] as $plugin_name => $branch_name ) {
-						if ( $plugin_name === 'jetpack' && isset( $features['jetpack'] ) && $features['jetpack'] === false  ) {
+						if ( $plugin_name === 'jetpack' && isset( $features['jetpack'] ) && $features['jetpack'] === false ) {
 							continue;
 						}
 						if ( $branch_name ) {

diff --git a/phpcs.xml b/phpcs.xml
@@ -10,6 +10,11 @@
 					<property name="text_domain" type="array" value="jurassic-ninja" />
 			</properties>
 		</rule>
+		<rule ref="Jetpack.Functions.I18n">
+			<properties>
+				<property name="text_domain" value="jurassic-ninja" />
+			</properties>
+		</rule>
 		<rule ref="Generic.Formatting.MultipleStatementAlignment.NotSameWarning">
 			<severity>0</severity>
 		</rule>