Fix issues raised by the PHP linter

WordPress · May 13, 2020 · bcfb64f · bcfb64f
1 parent 0714520
commit bcfb64f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/experimental-default-theme.json → lib/experimental-default-theme.json b/experimental-default-theme.json → lib/experimental-default-theme.json
diff --git a/lib/global-styles.php b/lib/global-styles.php
@@ -138,7 +138,7 @@ function gutenberg_experimental_global_styles_get_user_cpt_id() {
  */
 function gutenberg_experimental_global_styles_get_core() {
 	return gutenberg_experimental_global_styles_get_from_file(
-		dirname( dirname( __FILE__ ) ) . '/experimental-default-theme.json'
+		__DIR__ . '/experimental-default-theme.json'
 	);
 }
 

diff --git a/lib/theme.php b/lib/theme.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Experimental theme config functionality.
+ *
+ * @package gutenberg
+ */
 
 /**
  * Returns a full config or one of the sections containing the
@@ -38,17 +43,17 @@ function gutenberg_experimental_get_theme_config( $config_path, $section_name =
  * @return array Filtered editor settings.
  */
 function gutenberg_extend_settings_features( $settings ) {
-	$theme_features = gutenberg_experimental_get_theme_config(
-		dirname( dirname( __FILE__ ) ) . '/experimental-default-theme.json',
+	$theme_features                           = gutenberg_experimental_get_theme_config(
+		__DIR__ . '/experimental-default-theme.json',
 		'features'
 	);
-	$settings[ '__experimentalFeaturesConfig' ] = $theme_features;
+	$settings['__experimentalFeaturesConfig'] = $theme_features;
 
-	$theme_blocks = gutenberg_experimental_get_theme_config(
-		dirname( dirname( __FILE__ ) ) . '/experimental-default-theme.json',
+	$theme_blocks                           = gutenberg_experimental_get_theme_config(
+		__DIR__ . '/experimental-default-theme.json',
 		'blocks'
 	);
-	$settings[ '__experimentalBlocksConfig' ] = $theme_blocks;
+	$settings['__experimentalBlocksConfig'] = $theme_blocks;
 
 	return $settings;
 }