Merge branch 'next_release' into 4.x-dev

15 files changed, 33 insertions, 45 deletions

diff --git a/plugins/Marketplace/Api/Client.php b/plugins/Marketplace/Api/Client.php
index 5e81b6c982..7e6404c0f7 100644
--- a/plugins/Marketplace/Api/Client.php
+++ b/plugins/Marketplace/Api/Client.php
@@ -6,6 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
+
 namespace Piwik\Plugins\Marketplace\Api;
 
 use Exception as PhpException;
@@ -168,7 +169,7 @@ class Client
             $pluginName = $plugin->getPluginName();
             if (!$this->pluginManager->isPluginBundledWithCore($pluginName)) {
                 $isActivated = $this->pluginManager->isPluginActivated($pluginName);
-                $params[] = array('name' => $plugin->getPluginName(), 'version' => $plugin->getVersion(), 'activated' => (int) $isActivated);
+                $params[] = array('name' => $plugin->getPluginName(), 'version' => $plugin->getVersion(), 'activated' => (int)$isActivated);
             }
         }
 
@@ -189,7 +190,7 @@ class Client
     }
 
     /**
-     * @param  \Piwik\Plugin[] $plugins
+     * @param \Piwik\Plugin[] $plugins
      * @return array
      */
     public function getInfoOfPluginsHavingUpdate($plugins)
@@ -214,7 +215,6 @@ class Client
                 $plugin['repositoryChangelogUrl'] = $pluginHavingUpdate['repositoryChangelogUrl'];
                 $pluginDetails[] = $plugin;
             }
-
         }
 
         return $pluginDetails;
@@ -268,7 +268,7 @@ class Client
             $params['release_channel'] = $releaseChannel;
         }
 
-        $params['prefer_stable'] = (int) $this->environment->doesPreferStable();
+        $params['prefer_stable'] = (int)$this->environment->doesPreferStable();
         $params['piwik'] = $this->environment->getPiwikVersion();
         $params['php'] = $this->environment->getPhpVersion();
         $params['mysql'] = $this->environment->getMySQLVersion();
@@ -309,8 +309,8 @@ class Client
 
     /**
      * @param  $pluginOrThemeName
-     * @throws Exception
      * @return string
+     * @throws Exception
      */
     public function getDownloadUrl($pluginOrThemeName)
     {
@@ -332,12 +332,7 @@ class Client
      */
     public static function getApiServiceUrl()
     {
-        $url = GeneralConfig::getConfigValue('api_service_url');
-        if (!GeneralConfig::getConfigValue('force_matomo_ssl_request')) {
-            $url = str_replace('https', 'http', $url);
-        }
-
-        return $url;
+        return GeneralConfig::getConfigValue('api_service_url');
     }
 
 }
diff --git a/plugins/Marketplace/config/config.php b/plugins/Marketplace/config/config.php
index 1ebe26f698..0cfce1bb5d 100644
--- a/plugins/Marketplace/config/config.php
+++ b/plugins/Marketplace/config/config.php
@@ -1,19 +1,12 @@
 <?php
 
-use Piwik\Config\GeneralConfig;
 use Piwik\Plugins\Marketplace\Api\Service;
 use Piwik\Plugins\Marketplace\LicenseKey;
 use Psr\Container\ContainerInterface;
 
 return array(
     'MarketplaceEndpoint' => function (ContainerInterface $c) {
-        $domain = 'https://plugins.matomo.org';
-
-        if (GeneralConfig::getConfigValue('force_matomo_ssl_request') === 0) {
-            $domain = str_replace('https://', 'http://', $domain);
-        }
-
-        return $domain;
+        return 'http://plugins.matomo.org';
     },
     'Piwik\Plugins\Marketplace\Api\Service' => function (ContainerInterface $c) {
         /** @var \Piwik\Plugins\Marketplace\Api\Service $previous */
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
index 98ed34ef97..f3d3c4d5fe 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7b962e21b83262b9f071da707dcf99883239a00aef690cb3a9728b12a75016e
-size 56228
+oid sha256:f854b441cb8492fff6e3aff1ceae3cc516c858f0b81a953aa3f94f94b4ae8501
+size 56570
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
index 98ed34ef97..f3d3c4d5fe 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7b962e21b83262b9f071da707dcf99883239a00aef690cb3a9728b12a75016e
-size 56228
+oid sha256:f854b441cb8492fff6e3aff1ceae3cc516c858f0b81a953aa3f94f94b4ae8501
+size 56570
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
index 30fc2ac132..0384a5fda4 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed2d7cd62d9e6e32477756124df7155a5e6e682ba06639604478c48fcea4988d
-size 65469
+oid sha256:261822d8f71fd4845b39dad33bca14c32f19e29be70395037ba82381a2f031c0
+size 65807
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
index 30fc2ac132..0384a5fda4 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed2d7cd62d9e6e32477756124df7155a5e6e682ba06639604478c48fcea4988d
-size 65469
+oid sha256:261822d8f71fd4845b39dad33bca14c32f19e29be70395037ba82381a2f031c0
+size 65807
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
index eaf6c692ac..bc928afcb1 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42c4a75028c228db7e08ab9942cfcb83da26e9b8c144a9cf0b04ed6ba24bf914
-size 66783
+oid sha256:9d1d21ca974ef07cb551d1b69b1a92e442eb3ac91971d7c948dd178ef4f7c188
+size 67144
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
index b1c5f838ac..d3f137ea33 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ae653825869011af8da4691ad7e29d5848f153a248c9d146d33d32f4e2feab2
-size 66882
+oid sha256:2e4cebe6fb6eb9dfd2ee4ae3bfcabc2f1707f3a0cbc876f68973c572ec20349f
+size 67231
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
index 087941d9c9..19837d8750 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b3a87ad7dd6d416b7b2e368016ddb9494781e381adfe2597d0edbf7789f9599
-size 823436
+oid sha256:526b13fa9e37aa0a7bcc0c6d75a95af0bf583daa05fd28adff5898c4bb168952
+size 823683
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
index 5c30ccc3e4..071b211e9a 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9274a1fd72ec7562b807d1820e42a0024c11bbe50ff938d68ca0f31596fc976
-size 849857
+oid sha256:3370194d2128ad48d713421c0cc2c85ca61b396a0ed55658112b3ea55577688f
+size 850082
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
index 8108d2f3b9..c506b33d2a 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d765922d6d4b7dc83027a28b0d887cdd745038521507dee7daa9060fa55e949
-size 841322
+oid sha256:e9ed03963b75a88875b8d798419f7e7c388583bdde03e647471b0a49407ca2a9
+size 841435
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
index 90ba410bf0..7538956159 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6df29c4584f2a504ccacb5fb41ffd500457ad6ec02d6138a398556d8e66dbba3
-size 835965
+oid sha256:64e862542aefb884ac325b1ee79373139dd74e89e49d30c0871a72a486468536
+size 836133
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
index 0eb4ec5a23..61aabd845f 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:518f897c8a30a9533abb9c193cd35bd397c6c626389b2aaf8cc78362df28fe40
-size 845122
+oid sha256:31f9465d3808597861484d80fa8a89d37bcbec916c6cab1e0f74f46231e15b25
+size 845317
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
index 5c78442ebc..7ebe22d0d6 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8672f349e163b774a2e391e31d70a2abc751f18c70071361120b2282dca47092
-size 164466
+oid sha256:d52ed812139539ce64ca3235506c958c85a15e9d914363f332ba8d4ea0706117
+size 164081
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
index 722d331f3c..60594944a2 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:786bea8d1726b113e8595e28c77bdad43a93f40b92962a69c343d888d748b2d2
-size 161520
+oid sha256:1bccd2f10cb85e27e4e86eb26d27e2b81469545ccfdda6ec2ac3b2f36acb1f94
+size 161072