Use require over require_once for assets

require_once is unsafe for a require that should return a value on each function call. See WordPress/gutenberg#18599
Automattic · May 27, 2020 · 3a75e27 · 3a75e27
1 parent 5ad41d9
commit 3a75e27
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/apps/full-site-editing/full-site-editing-plugin/block-inserter-modifications/index.php b/apps/full-site-editing/full-site-editing-plugin/block-inserter-modifications/index.php
@@ -28,7 +28,7 @@ function enqueue_script( $filename, $in_footer = false ) {
 		);
 	}
 
-	$asset = require_once $asset_path;
+	$asset = require $asset_path;
 
 	wp_enqueue_script(
 		$filename,
@@ -42,7 +42,7 @@ function enqueue_script( $filename, $in_footer = false ) {
 /**
  * Enqueues a submodule style by its filename.
  *
- * @param string  $filename  Name of the style file w/o extension.
+ * @param string $filename  Name of the style file w/o extension.
  */
 function enqueue_style( $filename ) {
 	$style_file = is_rtl()

diff --git a/apps/full-site-editing/full-site-editing-plugin/event-countdown-block/index.php b/apps/full-site-editing/full-site-editing-plugin/event-countdown-block/index.php
@@ -10,7 +10,7 @@
 	function() {
 
 		$asset_file   = __DIR__ . '/dist/event-countdown-block.asset.php';
-		$asset        = file_exists( $asset_file ) ? require_once $asset_file : null;
+		$asset        = file_exists( $asset_file ) ? require $asset_file : null;
 		$dependencies = isset( $asset['dependencies'] ) ? $asset['dependencies'] : array();
 		$version      = isset( $asset['version'] ) ? $asset['version'] : filemtime( __DIR__ . '/dist/event-countdown-block.js' );
 

diff --git a/apps/full-site-editing/full-site-editing-plugin/global-styles/class-global-styles.php b/apps/full-site-editing/full-site-editing-plugin/global-styles/class-global-styles.php
@@ -317,7 +317,7 @@ public function block_editor_settings( $settings ) {
 	public function enqueue_block_editor_assets() {
 		$asset_file   = plugin_dir_path( __FILE__ ) . 'dist/global-styles.asset.php';
 		$asset        = file_exists( $asset_file )
-			? require_once $asset_file
+			? require $asset_file
 			: null;
 		$dependencies = isset( $asset['dependencies'] ) ?
 			$asset['dependencies'] :

diff --git a/apps/full-site-editing/full-site-editing-plugin/jetpack-timeline/index.php b/apps/full-site-editing/full-site-editing-plugin/jetpack-timeline/index.php
@@ -10,7 +10,7 @@
 	'init',
 	function() {
 		$asset_file   = __DIR__ . '/dist/jetpack-timleine.asset.php';
-		$asset        = file_exists( $asset_file ) ? require_once $asset_file : null;
+		$asset        = file_exists( $asset_file ) ? require $asset_file : null;
 		$dependencies = isset( $asset['dependencies'] ) ? $asset['dependencies'] : array();
 		$version      = isset( $asset['version'] ) ? $asset['version'] : filemtime( __DIR__ . '/index.js' );