Further Piwik.org => Matomo.org replacements (#12415)

* renaming more Piwik mentions

* some more updates

* fix some tests

* support matomo partially as require string

* fix tests

* fix failing system test

* fix tests

* fix system test

* fix test

4 files changed, 5 insertions, 5 deletions

diff --git a/plugins/CoreConsole/Commands/GenerateAngularComponent.php b/plugins/CoreConsole/Commands/GenerateAngularComponent.php
index 6342b78240..081da16b00 100644
--- a/plugins/CoreConsole/Commands/GenerateAngularComponent.php
+++ b/plugins/CoreConsole/Commands/GenerateAngularComponent.php
@@ -68,7 +68,7 @@ class GenerateAngularComponent extends GenerateAngularConstructBase
             sprintf('In <comment>%1$s/%2$s.php</comment> you should now require the JS files', $pluginPath, $pluginName),
             sprintf('<comment>%1$s%2$s</comment>', $pluginPath, $js1),
             sprintf('and the less file <comment>%1$s%2$s</comment>.', $pluginPath, $less1),
-            'If you are not familiar with this have a look at <comment>http://developer.piwik.org/guides/working-with-piwiks-ui</comment>'
+            'If you are not familiar with this have a look at <comment>https://developer.matomo.org/guides/working-with-piwiks-ui</comment>'
         ));
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreConsole/Commands/GenerateAngularDirective.php b/plugins/CoreConsole/Commands/GenerateAngularDirective.php
index 27fb7a65e0..c5c0a767c7 100644
--- a/plugins/CoreConsole/Commands/GenerateAngularDirective.php
+++ b/plugins/CoreConsole/Commands/GenerateAngularDirective.php
@@ -72,7 +72,7 @@ class GenerateAngularDirective extends GenerateAngularConstructBase
             sprintf('In <comment>%1$s/%2$s.php</comment> you should now require the JS files', $pluginPath, $pluginName),
             sprintf('<comment>%1$s%2$s</comment>, <comment>%1$s%3$s</comment>', $pluginPath, $js1, $js2),
             sprintf('and the less file <comment>%1$s%2$s</comment>.', $pluginPath, $less1),
-            'If you are not familiar with this have a look at <comment>https://developer.piwik.org/guides/working-with-piwiks-ui</comment>'
+            'If you are not familiar with this have a look at <comment>https://developer.matomo.org/guides/working-with-piwiks-ui</comment>'
         ));
     }
 }
diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php
index 17d1795db5..a214a40a5f 100644
--- a/plugins/CoreConsole/Commands/GeneratePlugin.php
+++ b/plugins/CoreConsole/Commands/GeneratePlugin.php
@@ -84,13 +84,13 @@ class GeneratePlugin extends GeneratePluginBase
         if ($isTheme) {
             $this->writeSuccessMessage($output, array(
                 sprintf('Theme %s %s generated.', $pluginName, $version),
-                'If you have not done yet check out our Theming guide <comment>https://developer.piwik.org/guides/theming</comment>',
+                'If you have not done yet check out our Theming guide <comment>https://developer.matomo.org/guides/theming</comment>',
                 'Enjoy!'
             ));
         } else {
             $this->writeSuccessMessage($output, array(
                 sprintf('Plugin %s %s generated.', $pluginName, $version),
-                'Our developer guides will help you developing this plugin, check out <comment>https://developer.piwik.org/guides</comment>',
+                'Our developer guides will help you developing this plugin, check out <comment>https://developer.matomo.org/guides</comment>',
                 'To see a list of available generators execute <comment>./console list generate</comment>',
                 'Enjoy!'
             ));
diff --git a/plugins/CoreConsole/Commands/GenerateWidget.php b/plugins/CoreConsole/Commands/GenerateWidget.php
index c04c30cd55..2b603aa1fa 100644
--- a/plugins/CoreConsole/Commands/GenerateWidget.php
+++ b/plugins/CoreConsole/Commands/GenerateWidget.php
@@ -49,7 +49,7 @@ class GenerateWidget extends GeneratePluginBase
         $replace        = array('ExamplePlugin'   => $pluginName,
                                 'MyExampleWidget' => $widgetClass,
                                 'Example Widget Name' => $this->makeTranslationIfPossible($pluginName, $widgetName),
-                                'About Piwik' => $category);
+                                'About Matomo' => $category);
         $whitelistFiles = array('/Widgets', '/Widgets/MyExampleWidget.php');
 
         $this->copyTemplateToPlugin($exampleFolder, $pluginName, $replace, $whitelistFiles);