Minor fixes

myrotvorets · Sep 17, 2023 · 988b115 · 988b115
1 parent 184d545
commit 988b115
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 24 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/index.php b/index.php
@@ -14,12 +14,12 @@
 if ( defined( 'ABSPATH' ) ) {
 	if ( defined( 'VENDOR_PATH' ) ) {
 		/** @psalm-suppress UnresolvableInclude, MixedOperand */
-		require constant( 'VENDOR_PATH' ) . '/vendor/autoload.php'; // NOSONAR
+		require_once constant( 'VENDOR_PATH' ) . '/vendor/autoload.php'; // NOSONAR
 	} elseif ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-		require __DIR__ . '/vendor/autoload.php';
+		require_once __DIR__ . '/vendor/autoload.php';
 	} elseif ( file_exists( ABSPATH . 'vendor/autoload.php' ) ) {
 		/** @psalm-suppress UnresolvableInclude */
-		require ABSPATH . 'vendor/autoload.php';
+		require_once ABSPATH . 'vendor/autoload.php';
 	}
 
 	Plugin::instance();

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -9,7 +9,7 @@
 }
 
 if ( ! file_exists( $_tests_dir . '/includes/functions.php' ) ) {
-	// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+	// phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped -- CLI
 	throw new Exception( "Could not find $_tests_dir/includes/functions.php, have you run bin/install-wp-tests.sh?" ); // NOSONAR
 }
 

diff --git a/tests/class-constant-mocker.php b/tests/class-constant-mocker.php
@@ -20,7 +20,7 @@ public static function clear(): void {
 
 		public static function define( string $constant, $value ): void {
 			if ( isset( self::$constants[ $constant ] ) ) {
-				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				// phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped -- tests/CLI
 				throw new InvalidArgumentException( sprintf( 'Constant "%s" is already defined', $constant ) );
 			}
 
@@ -33,7 +33,7 @@ public static function defined( string $constant ): bool {
 
 		public static function constant( string $constant ) {
 			if ( ! isset( self::$constants[ $constant ] ) ) {
-				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				// phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped -- tests/CLI
 				throw new InvalidArgumentException( sprintf( 'Constant "%s" is not defined', $constant ) );
 			}