diff options
| -rw-r--r-- | LEGALNOTICE | 4 | ||||
| -rw-r--r-- | core/AssetManager/UIAssetMinifier.php | 2 | ||||
| -rw-r--r-- | core/testMinimumPhpVersion.php | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/LEGALNOTICE b/LEGALNOTICE index f394df67e4..a2464aa0a1 100644 --- a/LEGALNOTICE +++ b/LEGALNOTICE @@ -114,6 +114,10 @@ THIRD-PARTY COMPONENTS AND LIBRARIES Notes: - reference implementation + Name: jshrink + Link: https://github.com/tedivm/jshrink + License: BSD-3-Clause + Name: sparkline Link: https//sourceforge.net/projects/sparkline/ License: Dual-licensed: New BSD or GPL v2 diff --git a/core/AssetManager/UIAssetMinifier.php b/core/AssetManager/UIAssetMinifier.php index fe29f1ec61..83705f7e9c 100644 --- a/core/AssetManager/UIAssetMinifier.php +++ b/core/AssetManager/UIAssetMinifier.php @@ -62,6 +62,6 @@ class UIAssetMinifier extends Singleton private static function validateDependency() { if (!class_exists("JShrink\Minifier")) - throw new Exception("JShrink dependency is managed using Composer."); + throw new Exception("JShrink dependency is managed using Composer. <br> $ php composer.phar update "); } } diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php index 90ccdd2d0f..e7dd79fd04 100644 --- a/core/testMinimumPhpVersion.php +++ b/core/testMinimumPhpVersion.php @@ -53,7 +53,7 @@ if ($minimumPhpInvalid) { . "<pre> curl -sS https://getcomposer.org/installer | php \n\n php composer.phar install\n\n</pre> "; if (DIRECTORY_SEPARATOR === '\\' /* ::isWindows() */) { $composerInstall = "Download and run <a href=\"https://getcomposer.org/Composer-Setup.exe\"><b>Composer-Setup.exe</b></a>, it will install the latest Composer version and set up your PATH so that you can just call composer from any directory in your command line. " - . " <br>Then run this command in a terminal in the piwik directory: <br> $ php composer update "; + . " <br>Then run this command in a terminal in the piwik directory: <br> $ php composer.phar update "; } $piwik_errorMessage .= "<p>It appears the <a href='https://getcomposer.org/' target='_blank'>composer</a> tool is not yet installed. You can install Composer in a few easy steps:\n\n". "<br/>" . $composerInstall. |