Compatibility with JW Player 7 (JW7)

It's version matching pattern fails miserably.

6 version fails in a whole different way

Here's a first patch that introduces version 7 support and also fixes some out dated config for the cloud hosted player.

Fixed some typo in hook_update.

Committed, lets move this to 8.x-1.x now.

Added first version, also added tests.

1. +++ b/config/install/jw_player.settings.yml
   @@ -0,0 +1,3 @@
   +jw_player_version: 6
   \ No newline at end of file
   diff --git a/config/jw_player.settings.yml b/config/jw_player.settings.yml
   

   make sure you have a newline at the end, or diff is unhappy.

2. +++ b/jw_player.install
   @@ -32,3 +32,16 @@ function jw_player_requirements($phase) {
   +  $config->set('jw_player_version', 6);
   +  drupal_set_message(t('JW Player version has been set to 6.'));
   

   almost correct, you just forgot to actually save the configuration changes at the end.

3. +++ b/jw_player.module
   @@ -266,3 +286,25 @@ function jw_player_library_info_alter(&$libraries, $extension) {
   + * Gets the correct key for the corresponding JW Player version.
   + *
   + * @return string
   + *   The license key as entered in the UI.
   + */
   +function jw_player_get_key() {
   +  $config = \Drupal::config('jw_player.settings');
   +  return jw_player_use_legacy() ? $config->get('jw_player_key') : $config->get('jw_player_key_7');
   

   think about this more, I'm actually not sure that we need to care about storing a different key. You either use one or the other version. Lets just have a single player_key setting and use that.

4. +++ b/src/Form/JwplayerSettingsForm.php
   @@ -39,23 +39,53 @@ class JwplayerSettingsForm extends ConfigFormBase {
   +    $url = 'https://dashboard.jwplayer.com/#/players/downloads';
   ...
   -    $form['license_key'] = array(
   +    $form['jw_player_cloud_player_default'] = array(
          '#type' => 'textfield',
   

   jw_player_cloud_player_default as a name is a bit strange.

   Lets just use exactly the same their UI, which is "Cloud Player Library Url". Both in the #title and the name (lowercased)

5. +++ b/src/Form/JwplayerSettingsForm.php
   @@ -39,23 +39,53 @@ class JwplayerSettingsForm extends ConfigFormBase {
   +    $form['jw_player_key_7'] = array(
          '#type' => 'textfield',
   -      '#title' => $this->t('Cloud-Hosted Account Token'),
   -      '#description' => $this->t('Set the account token for a Cloud-Hosted Player, or leave empty if using a Self-Hosted Player. You can retrieve your token from <a href="@url">your account settings page at jwplayer.com</a>.', array(
   +      '#title' => $this->t('Self-Hosted Player License Key (version 7.x)'),
   +      '#description' => $this->t('Enter your key here. You can retrieve your license key from <a href="@url" target="_blank">your downloads page at jwplayer.com</a>.', array(
   

   then we no longer need this.

Changes made based on comment #8. Also extended the tests a bit.

+++ b/src/Tests/JwPlayer7ConfigurationTest.php
@@ -64,7 +64,7 @@ class JwPlayer7ConfigurationTest extends WebTestBase {
     // Add a random "Cloud-Hosted Account Token".
     $edit = [
-      'jw_player_cloud_player_default' => $token = 'https://content.jwplatform.com/libraries/' . $this->randomMachineName(8) . '.js',
+      'cloud_player_library_url' => $token = 'https://content.jwplatform.com/libraries/' . $this->randomMachineName(8) . '.js',
       'jw_player_version' => 7,

the comment here is outdated, it isn't an account token anymore.

So true, also changed some other lines. :)

Indeed. looks good now to me, committed and pushed.