Fix/phpcs

.github/workflows/lint.yml

@@ -22,4 +22,24 @@ jobs:
     - name: npm install
       run: npm install
     - name: eslint
-      run: npm run lint-js
+      run: npm run lint-js
+
+  phpcs:
+    name: PHP Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: PHP version
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          coverage: none
+
+      - name: composer install
+        run: composer install
+
+      - name: PHPCS check
+        run: composer run lint

assets/js/src/models/media-collection.js

@@ -50,8 +50,8 @@ var MediaCollection = Backbone.Collection.extend({
 		this.searchTerm = options.searchTerm || '';
 		this.dates = options.dates || 'all';
 		this.tag = options.tag || '';
-		this.folderId = options.folderId || '';
-		this.oldFolderId = options.oldFolderId || '';
+		this.folder_id = options.folder_id || '';
+		this.old_folder_id = options.old_folder_id || '';
 		this.labelPath = options.labelPath || '';
 		this.oldLabelPath = options.oldLabelPath || '';
 
@@ -85,14 +85,14 @@ var MediaCollection = Backbone.Collection.extend({
 			this.fetch();
 		});
 
-		this.listenTo(wpbc.broadcast, 'change:folder', function (folderId) {
-			this.oldFolderId = this.folderId;
+		this.listenTo(wpbc.broadcast, 'change:folder', function (folder_id) {
+			this.old_folder_id = this.folder_id;
 
-			if (folderId === 'all') {
-				folderId = '';
+			if (folder_id === 'all') {
+				folder_id = '';
 			}
 
-			this.folderId = folderId;
+			this.folder_id = folder_id;
 			this.fetch();
 		});
 
@@ -189,8 +189,8 @@ var MediaCollection = Backbone.Collection.extend({
 				labels: this.labels,
 				labelPath: this.labelPath,
 				oldLabelPath: this.oldLabelPath,
-				oldFolderId: this.oldFolderId,
-				folderId: this.folderId,
+				old_folder_id: this.old_folder_id,
+				folder_id: this.folder_id,
 				state: this.state,
 				oldState: this.oldState,
 				tagName: wpbc.preload.tags[this.tag],
@@ -205,7 +205,7 @@ var MediaCollection = Backbone.Collection.extend({
 				'search',
 				'tags',
 				'type',
-				'folderId',
+				'folder_id',
 				'tagName',
 				'state',
 			);

assets/js/src/models/media.js

@@ -61,8 +61,8 @@ var MediaModel = Backbone.Model.extend({
 				name: this.get('name'),
 				nonce: wpbc.preload.nonce,
 				tags: this.get('tags'),
-				oldFolderId: this.get('oldFolderId'),
-				folderId: this.get('folderId'),
+				old_folder_id: this.get('old_folder_id'),
+				folder_id: this.get('folder_id'),
 				type: this.get('mediaType'),
 				custom_fields: this.get('custom_fields'),
 				history: this.get('_change_history'),

assets/js/src/views/brightcove-media-manager.js

@@ -119,8 +119,8 @@ var BrightcoveMediaManagerView = BrightcoveView.extend({
 
 		this.listenTo(wpbc.broadcast, 'change:folder', function (folder) {
 			this.clearPreview();
-			this.model.set('oldFolderId', this.model.get('folderId'));
-			this.model.set('folderId', folder);
+			this.model.set('old_folder_id', this.model.get('folder_id'));
+			this.model.set('folder_id', folder);
 		});
 
 		this.listenTo(wpbc.broadcast, 'change:label', function (labelPath) {

assets/js/src/views/toolbar.js

@@ -33,7 +33,7 @@ var ToolbarView = BrightcoveView.extend({
 			folders: wpbc.preload.folders,
 			labels: wpbc.preload.labels,
 			labelPath: this.model.get('labelPath'),
-			folderId: this.model.get('folderId'),
+			folder_id: this.model.get('folder_id'),
 			account: this.model.get('account'),
 		};
 
@@ -108,8 +108,8 @@ var ToolbarView = BrightcoveView.extend({
 	},
 
 	foldersChanged: function (event) {
-		this.model.set('oldFolderId', this.model.get('folderId'));
-		this.model.set('folderId', event.target.value);
+		this.model.set('old_folder_id', this.model.get('folder_id'));
+		this.model.set('folder_id', event.target.value);
 		wpbc.broadcast.trigger('change:folder', event.target.value);
 	},
 

assets/js/src/views/video-edit.js

@@ -409,7 +409,7 @@ var VideoEditView = BrightcoveView.extend({
 		this.model.set('width', this.$el.find('.brightcove-width').val());
 		this.model.set('poster', this.$el.find('.brightcove-poster').val());
 		this.model.set('thumbnail', this.$el.find('.brightcove-thumbnail').val());
-		this.model.set('folderId', this.$el.find('.brightcove-folder').val());
+		this.model.set('folder_id', this.$el.find('.brightcove-folder').val());
 
 		const isVariant = this.$el.find('.brightcove-variant').val();
 
@@ -585,7 +585,7 @@ var VideoEditView = BrightcoveView.extend({
 		// Due to a change in the API response, text_tracks might not be defined if the video lacks text_tracks.
 		options.text_tracks = options.text_tracks || [];
 
-		this.model.set('oldFolderId', options.folder_id);
+		this.model.set('old_folder_id', options.folder_id);
 
 		// Render the model into the template
 		this.$el.html(this.template(options));

brightcove-video-connect.php

@@ -9,6 +9,8 @@
  * License: GPLv2+
  * Text Domain: brightcove
  * Domain Path: /languages
+ *
+ * @package Brightcove_Video_Connect
  */
 
 /**
@@ -72,7 +74,7 @@ function brightcove_deactivate() {
 
 // Wireup actions.
 if ( is_admin() ) {
-    add_action( 'admin_notices', array( 'BC_Setup', 'bc_admin_notices' ) );
+	add_action( 'admin_notices', array( 'BC_Setup', 'bc_admin_notices' ) );
 }
 
 add_action( 'init', array( 'BC_Setup', 'action_init' ) );
@@ -83,8 +85,6 @@ function brightcove_deactivate() {
 add_action( 'init', array( 'BC_Setup', 'action_init_all' ), 9 ); // Ensures the menu is loaded on all pages.
 add_action( 'init', array( 'BC_Notification_API', 'setup' ), 9 );
 
-// add_action( 'brightcove_upgrade', array( 'BC_Notification_API', 'maybe_backport_subscriptions' ) ); // @TODO Verify API as errors don't seem to match the documentation
-
 if ( ! defined( 'WPCOM_IS_VIP_ENV' ) || ! WPCOM_IS_VIP_ENV ) {
 
 	// Activation / Deactivation.

cli/class-brightcove-cli.php

@@ -1,4 +1,9 @@
 <?php
+/**
+ * Brightcove WP CLI commands file.
+ *
+ * @package Brightcove_Video_Connect
+ */
 
 /**
  * Implements a set of commands to interact with the Brightcove Video Connect plugin

developers.md

@@ -23,10 +23,10 @@ While the plugin itself will function on a local or firewalled machine, some ope
 
 The brightcove plugin uses these hooks internally when rendering out plugin pages. Developers can add content via these hooks, augmenting the existing admin pages.
 
- * `brightcove/admin/settings_page`: Fires when the setting page loads.
- * `brightcove/admin/videos_page`: Fires when the videos page loads.
- * `brightcove/admin/playlists_page`: Fires when the playlist page loads.
- * `brightcove/admin/edit_source_page`: Fires when the edit source page loads.
+ * `brightcove_admin_settings_page`: Fires when the setting page loads.
+ * `brightcove_admin_videos_page`: Fires when the videos page loads.
+ * `brightcove_admin_playlists_page`: Fires when the playlist page loads.
+ * `brightcove_admin_edit_source_page`: Fires when the edit source page loads.
 
 ## JavaScript architecture