Convert new functionality to be PSR-compliant.

Author: sheabunge

phpcs.xml

@@ -8,8 +8,10 @@
 		<!-- allow hooks containing forward slashes -->
 		<exclude name="WordPress.NamingConventions.ValidHookName.UseUnderscores" />
 
-		<!-- necessary for core plugin function -->
-		<exclude name="Squiz.PHP.Eval.Discouraged" />
+		<!-- PSR-4 -->
+		<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
+		<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
+		<exclude name="Squiz.Commenting.FileComment.Missing" />
 
 		<!-- allow embedding PHP within HTML attribute values -->
 		<exclude name="Squiz.PHP.EmbeddedPhp.ContentBeforeOpen" />
@@ -34,7 +36,7 @@
 		<exclude name="WordPress.PHP.DisallowShortTernary.Found" />
 		<exclude name="Generic.PHP.DisallowShortOpenTag.EchoFound" />
 		<exclude name="Universal.Arrays.DisallowShortArraySyntax.Found" />
-    </rule>
+	</rule>
 
 	<rule ref="PHPCompatibilityWP">
 		<include-pattern>*\.php$</include-pattern>

src/php/Admin/Bootstrap_Admin.php

@@ -241,6 +241,7 @@ public function debug_information( array $info ): array {
 	 * Print any admin notices that have not been dismissed.
 	 *
 	 * @return void
+	 * @noinspection PhpRedundantOptionalArgumentInspection
 	 */
 	public function print_notices() {
 		global $current_user;

src/php/Admin/Menus/Admin_Menu.php

@@ -2,7 +2,6 @@
 
 namespace Code_Snippets\Admin\Menus;
 
-use Code_Snippets\Model\Snippet;
 use function Code_Snippets\code_snippets;
 
 /**

src/php/Admin/Menus/Edit_Menu.php

@@ -10,6 +10,8 @@
 use function Code_Snippets\Settings\get_setting;
 use function Code_Snippets\Settings\get_settings_values;
 use function Code_Snippets\Utils\enqueue_code_editor;
+use const Code_Snippets\PLUGIN_FILE;
+use const Code_Snippets\PLUGIN_VERSION;
 
 /**
  * This class handles the add/edit menu.
@@ -145,7 +147,6 @@ public function load_snippet_data() {
 	 * @return void
 	 */
 	public function enqueue_assets() {
-		$plugin = code_snippets();
 		$rtl = is_rtl() ? '-rtl' : '';
 
 		$settings = get_settings_values();
@@ -156,20 +157,20 @@ public function enqueue_assets() {
 
 		wp_enqueue_style(
 			self::CSS_HANDLE,
-			plugins_url( "dist/edit$rtl.css", $plugin->file ),
+			plugins_url( "dist/edit$rtl.css", PLUGIN_FILE ),
 			[
 				'code-editor',
 				'wp-components',
 			],
-			$plugin->version
+			PLUGIN_VERSION
 		);
 
 		wp_enqueue_script(
 			self::JS_HANDLE,
-			plugins_url( 'dist/edit.js', $plugin->file ),
+			plugins_url( 'dist/edit.js', PLUGIN_FILE ),
 			[ 'code-snippets-code-editor' ] + self::$script_deps,
-			$plugin->version,
-			true
+			PLUGIN_VERSION,
+			[ 'in_footer' => true ]
 		);
 
 		wp_set_script_translations( self::JS_HANDLE, 'code-snippets' );
@@ -179,7 +180,7 @@ public function enqueue_assets() {
 			wp_enqueue_editor();
 		}
 
-		$plugin->localize_script( self::JS_HANDLE );
+		code_snippets()->localize_script( self::JS_HANDLE );
 
 		wp_localize_script(
 			self::JS_HANDLE,

src/php/Admin/Menus/Import_Menu.php

@@ -3,7 +3,7 @@
 namespace Code_Snippets\Admin\Menus;
 
 use Code_Snippets\Admin\Contextual_Help;
-use Code_Snippets\Import;
+use Code_Snippets\Export\Import;
 use function Code_Snippets\code_snippets;
 
 /**

src/php/Admin/Menus/Manage_Menu.php

@@ -183,17 +183,17 @@ public function enqueue_assets() {
 
 		wp_enqueue_style(
 			self::CSS_HANDLE,
-			plugins_url( "dist/manage$rtl.css", $plugin->file ),
+			plugins_url( "dist/manage$rtl.css", PLUGIN_FILE ),
 			self::$style_deps,
-			$plugin->version
+			PLUGIN_VERSION
 		);
 
 		wp_enqueue_script(
 			self::JS_HANDLE,
-			plugins_url( 'dist/manage.js', $plugin->file ),
+			plugins_url( 'dist/manage.js', PLUGIN_FILE ),
 			self::$script_deps,
-			$plugin->version,
-			true
+			PLUGIN_VERSION,
+			[ 'in_footer' => true ]
 		);
 
 		Code_Highlighter::enqueue_all_prism_themes();

src/php/Client/Cloud_API.php

@@ -81,7 +81,7 @@ public static function get_local_token(): string {
 	/**
 	 * Check if the API key is set and verified.
 	 *
-	 * @return boolean
+	 * @return bool
 	 */
 	public static function is_cloud_connection_available(): bool {
 		return false;
@@ -174,9 +174,9 @@ private static function unpack_request_json( $response ): ?array {
 	/**
 	 * Search Code Snippets Cloud -> Static Function
 	 *
-	 * @param string  $search_method Search by name of codevault or keyword(s).
-	 * @param string  $search        Search query.
-	 * @param integer $page          Search result page to retrieve. Defaults to '0'.
+	 * @param string $search_method Search by name of codevault or keyword(s).
+	 * @param string $search        Search query.
+	 * @param int    $page          Search result page to retrieve. Defaults to '0'.
 	 *
 	 * @return Cloud_Snippets Result of search query.
 	 */

src/php/Core/DB.php

@@ -99,8 +99,8 @@ public function get_table_name( ?bool $is_network = null ): string {
 	/**
 	 * Determine whether a database table exists.
 	 *
-	 * @param string  $table_name Name of database table to check.
-	 * @param boolean $refresh    Rerun the query, instead of using a cached value.
+	 * @param string $table_name Name of database table to check.
+	 * @param bool   $refresh    Rerun the query, instead of using a cached value.
 	 *
 	 * @return bool Whether the database table exists.
 	 */
@@ -188,7 +188,7 @@ public static function create_table( string $table_name ): bool {
 	 *
 	 * @param string        $table_name  Name of table to fetch snippets from.
 	 * @param array<string> $scopes      List of scopes to include in query.
-	 * @param boolean       $active_only Whether to only fetch active snippets from the table.
+	 * @param bool          $active_only Whether to only fetch active snippets from the table.
 	 *
 	 * @return array<string, array<string, mixed>>|false List of active snippets, if any could be retrieved.
 	 *
@@ -280,6 +280,8 @@ static function ( $a, $b ) use ( $comparisons ) {
 	 *     network: bool,
 	 *     priority: int,
 	 * } List of active snippets.
+	 *
+	 * @noinspection PhpRedundantOptionalArgumentInspection
 	 */
 	public function fetch_active_snippets( array $scopes ): array {
 		$active_snippets = [];

src/php/Export/Export.php

@@ -22,8 +22,8 @@ abstract class Export {
 	/**
 	 * Class constructor
 	 *
-	 * @param array<int>   $ids     List of snippet IDs to export.
-	 * @param boolean|null $network Whether to fetch snippets from local or network table.
+	 * @param array<int> $ids     List of snippet IDs to export.
+	 * @param bool|null  $network Whether to fetch snippets from local or network table.
 	 */
 	public function __construct( array $ids, ?bool $network = null ) {
 		$this->snippets_list = get_snippets( $ids, $network );

src/php/Export/Export_JSON.php

@@ -3,7 +3,7 @@
 namespace Code_Snippets\Export;
 
 use Code_Snippets\Model\Snippet;
-use function Code_Snippets\code_snippets;
+use const Code_Snippets\PLUGIN_VERSION;
 
 /**
  * Handles exporting snippets from the site in various downloadable formats
@@ -41,7 +41,7 @@ function ( $value ) {
 		}
 
 		return [
-			'generator'    => 'Code Snippets v' . code_snippets()->version,
+			'generator'    => 'Code Snippets v' . PLUGIN_VERSION,
 			'date_created' => gmdate( 'Y-m-d H:i' ),
 			'snippets'     => $snippets,
 		];