rename again

CHANGELOG.md

@@ -32,11 +32,11 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)*
 * The deprecated Platform API class `\Piwik\DeviceDetectorFactory` has been removed. Use `\Piwik\DeviceDetector\DeviceDetectorFactory` instead
 * The JavaScript tracker now uses `sendBeacon` by default if supported by the browser. You can disable this by calling the tracker method `disableAlwaysUseSendBeacon`. As a result, callback parameters won't work anymore and a tracking request might not appear in the developer tools.
 * The console option `--piwik-domain` has been removed. Use `--matomo-domain` instead
-* The core plugin `CustomPiwikJs` was renamed `CustomTrackerJs`
+* The core plugin `CustomPiwikJs` was renamed `CustomJsTracker`
 
 ### Deprecations
-* The event `CustomPiwikJs.piwikJsChanged` has been deprecated. Use `CustomTrackerJs.trackerJsChanged` instead
-* The event `CustomPiwikJs.shouldAddTrackerFile` has been deprecated. Use `CustomTrackerJs.shouldAddTrackerFile` instead
+* The event `CustomPiwikJs.piwikJsChanged` has been deprecated. Use `CustomJsTracker.trackerJsChanged` instead
+* The event `CustomPiwikJs.shouldAddTrackerFile` has been deprecated. Use `CustomJsTracker.shouldAddTrackerFile` instead
 
 ## Matomo 3.13.1
 

config/global.ini.php

@@ -1016,7 +1016,7 @@
 Plugins[] = Marketplace
 Plugins[] = ProfessionalServices
 Plugins[] = UserId
-Plugins[] = CustomTrackerJs
+Plugins[] = CustomJsTracker
 Plugins[] = Tour
 
 [PluginsInstalled]

config/global.php

@@ -223,5 +223,5 @@
     /**
      * @todo remove in Matomo 5. For BC only
      */
-    'Piwik\Plugins\CustomPiwikJs\TrackerUpdater' => DI\get(Piwik\Plugins\CustomTrackerJs\TrackerUpdater::class),
+    'Piwik\Plugins\CustomPiwikJs\TrackerUpdater' => DI\get(Piwik\Plugins\CustomJsTracker\TrackerUpdater::class),
 );

core/FileIntegrity.php

@@ -10,8 +10,8 @@
 namespace Piwik;
 
 use Piwik\Container\StaticContainer;
-use Piwik\Plugins\CustomTrackerJs\Exception\AccessDeniedException;
-use Piwik\Plugins\CustomTrackerJs\TrackerUpdater;
+use Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException;
+use Piwik\Plugins\CustomJsTracker\TrackerUpdater;
 
 class FileIntegrity
 {
@@ -372,7 +372,7 @@ protected static function isModifiedPathValid($path)
             // as trivial because piwik.js might be already updated, or updated on the next request. We cannot define
             // 2 or 3 different filesizes and md5 hashes for one file so we check it here.
 
-            if (Plugin\Manager::getInstance()->isPluginActivated('CustomTrackerJs')) {
+            if (Plugin\Manager::getInstance()->isPluginActivated('CustomJsTracker')) {
                 $trackerUpdater = new TrackerUpdater();
 
                 if ($trackerUpdater->getCurrentTrackerFileContent() === $trackerUpdater->getUpdatedTrackerFileContent()) {
@@ -383,7 +383,7 @@ protected static function isModifiedPathValid($path)
 
                 try {
                     // the piwik.js tracker file was not updated yet, but may be updated just after the update by
-                    // one of the events CustomTrackerJs is listening to or by a scheduled task.
+                    // one of the events CustomJsTracker is listening to or by a scheduled task.
                     // In this case, we check whether such an update will succeed later and if it will, the file is
                     // valid as well as it will be updated on the next request
                     $trackerUpdater->checkWillSucceed();

core/Updates/4.0.0-b1.php

@@ -62,13 +62,13 @@ protected function renameTrackerJsPluginInConfig()
 
         foreach ($config->Plugins['Plugins'] as $index => $plugin) {
             if ($plugin === 'CustomPiwikJs') {
-                $config->Plugins['Plugins'][$index] = 'CustomTrackerJs';
+                $config->Plugins['Plugins'][$index] = 'CustomJsTracker';
             }
         }
 
         foreach ($config->PluginsInstalled['PluginsInstalled'] as $index => $plugin) {
             if ($plugin === 'CustomPiwikJs') {
-                $config->PluginsInstalled['PluginsInstalled'][$index] = 'CustomTrackerJs';
+                $config->PluginsInstalled['PluginsInstalled'][$index] = 'CustomJsTracker';
             }
         }
 

plugins/CustomTrackerJs/API.php → plugins/CustomJsTracker/API.php

@@ -6,16 +6,16 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomTrackerJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Container\StaticContainer;
 use Piwik\Piwik;
-use Piwik\Plugins\CustomTrackerJs\Exception\AccessDeniedException;
+use Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException;
 
 /**
- * API for plugin CustomTrackerJs
+ * API for plugin CustomJsTracker
  *
- * @method static \Piwik\Plugins\CustomTrackerJs\API getInstance()
+ * @method static \Piwik\Plugins\CustomJsTracker\API getInstance()
  */
 class API extends \Piwik\Plugin\API
 {
@@ -29,7 +29,7 @@ public function doesIncludePluginTrackersAutomatically()
         Piwik::checkUserHasSomeAdminAccess();
 
         try {
-            $updater = StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackerUpdater');
+            $updater = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater');
             $updater->checkWillSucceed();
             return true;
         } catch (AccessDeniedException $e) {

plugins/CustomTrackerJs/Commands/UpdateTracker.php → plugins/CustomJsTracker/Commands/UpdateTracker.php

@@ -6,12 +6,12 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomTrackerJs\Commands;
+namespace Piwik\Plugins\CustomJsTracker\Commands;
 
 use Piwik\Container\StaticContainer;
 use Piwik\Plugin\ConsoleCommand;
-use Piwik\Plugins\CustomTrackerJs\TrackerUpdater;
-use Piwik\Plugins\CustomTrackerJs\TrackingCode\PluginTrackerFiles;
+use Piwik\Plugins\CustomJsTracker\TrackerUpdater;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -46,7 +46,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     public function updateTracker($sourceFile, $targetFile, $ignoreMinified)
     {
-        $pluginTrackerFiles = StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackingCode\PluginTrackerFiles');
+        $pluginTrackerFiles = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles');
 
         if ($ignoreMinified) {
             if (empty($sourceFile) || $sourceFile === $this->getPathOriginalPiwikJs()) {
@@ -56,7 +56,7 @@ public function updateTracker($sourceFile, $targetFile, $ignoreMinified)
             $pluginTrackerFiles->ignoreMinified();
         }
 
-        $updater = StaticContainer::getContainer()->make('Piwik\Plugins\CustomTrackerJs\TrackerUpdater', array(
+        $updater = StaticContainer::getContainer()->make('Piwik\Plugins\CustomJsTracker\TrackerUpdater', array(
             'fromFile' => $sourceFile, 'toFile' => $targetFile
         ));
         $updater->setTrackerFiles($pluginTrackerFiles);

plugins/CustomTrackerJs/CustomTrackerJs.php → plugins/CustomJsTracker/CustomJsTracker.php

@@ -6,13 +6,13 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomTrackerJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Container\StaticContainer;
 use Piwik\Log;
 use Piwik\Plugin;
 
-class CustomTrackerJs extends Plugin
+class CustomJsTracker extends Plugin
 {
     public function registerEvents()
     {
@@ -30,8 +30,8 @@ public function registerEvents()
     public function updateTracker()
     {
         try {
-            if (Plugin\Manager::getInstance()->isPluginActivated('CustomTrackerJs')) {
-                $trackerUpdater = StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackerUpdater');
+            if (Plugin\Manager::getInstance()->isPluginActivated('CustomJsTracker')) {
+                $trackerUpdater = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater');
                 $trackerUpdater->update();
             }
         } catch (\Exception $e) {

plugins/CustomTrackerJs/Diagnostic/TrackerJsCheck.php → plugins/CustomJsTracker/Diagnostic/TrackerJsCheck.php

@@ -5,11 +5,11 @@
  * @link https://matomo.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\CustomTrackerJs\Diagnostic;
+namespace Piwik\Plugins\CustomJsTracker\Diagnostic;
 
 use Piwik\Filechecks;
 use Piwik\Filesystem;
-use Piwik\Plugins\CustomTrackerJs\File;
+use Piwik\Plugins\CustomJsTracker\File;
 use Piwik\Plugins\Diagnostics\Diagnostic\Diagnostic;
 use Piwik\Plugins\Diagnostics\Diagnostic\DiagnosticResult;
 use Piwik\SettingsPiwik;
@@ -54,21 +54,21 @@ public function execute()
             }
         }
 
-        $label = $this->translator->translate('CustomTrackerJs_DiagnosticPiwikJsWritable', $this->makeFilesTitles($filesToCheck));
+        $label = $this->translator->translate('CustomJsTracker_DiagnosticPiwikJsWritable', $this->makeFilesTitles($filesToCheck));
 
         if (empty($notWritableFiles)) {
             return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_OK, ''));
         }
 
-        $comment = $this->translator->translate('CustomTrackerJs_DiagnosticPiwikJsNotWritable', $this->makeFilesTitles($notWritableFiles));
+        $comment = $this->translator->translate('CustomJsTracker_DiagnosticPiwikJsNotWritable', $this->makeFilesTitles($notWritableFiles));
 
         if (!SettingsServer::isWindows()) {
             $command = '';
             foreach ($notWritableFiles as $notWritableFile) {
                 $realpath = Filesystem::realpath(PIWIK_INCLUDE_PATH . '/' . $notWritableFile);
                 $command .= "<br/><code> chmod +w $realpath<br/> chown ". Filechecks::getUserAndGroup() ." " . $realpath . "</code><br />";
             }
-            $comment .= $this->translator->translate('CustomTrackerJs_DiagnosticPiwikJsMakeWritable', array($this->makeFilesTitles($notWritableFiles), $command));
+            $comment .= $this->translator->translate('CustomJsTracker_DiagnosticPiwikJsMakeWritable', array($this->makeFilesTitles($notWritableFiles), $command));
         }
 
         return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, $comment));

plugins/CustomTrackerJs/Exception/AccessDeniedException.php → plugins/CustomJsTracker/Exception/AccessDeniedException.php

@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomTrackerJs\Exception;
+namespace Piwik\Plugins\CustomJsTracker\Exception;
 
 use Exception;
 

plugins/CustomTrackerJs/File.php → plugins/CustomJsTracker/File.php

@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomTrackerJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
-use Piwik\Plugins\CustomTrackerJs\Exception\AccessDeniedException;
+use Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException;
 
 class File
 {

plugins/CustomTrackerJs/Tasks.php → plugins/CustomJsTracker/Tasks.php

@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomTrackerJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Container\StaticContainer;
 
@@ -19,7 +19,7 @@ public function schedule()
 
     public function updateTracker()
     {
-        $updater = StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackerUpdater');
+        $updater = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater');
         $updater->update();
     }
 }

plugins/CustomTrackerJs/TrackerUpdater.php → plugins/CustomJsTracker/TrackerUpdater.php

@@ -6,19 +6,19 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomTrackerJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Common;
 use Piwik\Container\StaticContainer;
-use Piwik\Plugins\CustomTrackerJs\TrackingCode\PiwikJsManipulator;
-use Piwik\Plugins\CustomTrackerJs\TrackingCode\PluginTrackerFiles;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PiwikJsManipulator;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles;
 use Piwik\Piwik;
 
 /**
  * Updates the Piwik JavaScript Tracker "piwik.js" in case plugins extend the tracker.
  *
  * Usage:
- * StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackerUpdater')->update();
+ * StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater')->update();
  */
 class TrackerUpdater
 {
@@ -54,7 +54,7 @@ public function __construct($fromFile = null, $toFile = null)
 
         $this->setFromFile($fromFile);
         $this->setToFile($toFile);
-        $this->trackerFiles = StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackingCode\PluginTrackerFiles');
+        $this->trackerFiles = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles');
     }
 
     public function setFromFile($fromFile)
@@ -139,7 +139,7 @@ public function update()
                  *
                  * @param string $absolutePath The path to the new piwik.js file.
                  */
-                Piwik::postEvent('CustomTrackerJs.trackerJsChanged', [$savedFile]);
+                Piwik::postEvent('CustomJsTracker.trackerJsChanged', [$savedFile]);
 
                 /**
                  * @todo remove in Matomo 5. For BC only
@@ -162,7 +162,7 @@ private function updateAlternative($fromFile, $toFile, $newContent)
             if ($file->hasWriteAccess() && !$file->isFileContentSame($newContent)) {
                 $savedFiles = $file->save($newContent);
                 foreach ($savedFiles as $savedFile) {
-                    Piwik::postEvent('CustomTrackerJs.trackerJsChanged', [$savedFile]);
+                    Piwik::postEvent('CustomJsTracker.trackerJsChanged', [$savedFile]);
 
                     /**
                      * @todo remove in Matomo 5. For BC only

plugins/CustomTrackerJs/TrackingCode/JsTestPluginTrackerFiles.php → plugins/CustomJsTracker/TrackingCode/JsTestPluginTrackerFiles.php

@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\CustomTrackerJs\TrackingCode;
+namespace Piwik\Plugins\CustomJsTracker\TrackingCode;
 
 /**
  * Used for when running Piwik tracker tests. We simply include all custom tracker files there.

plugins/CustomTrackerJs/TrackingCode/PiwikJsManipulator.php → plugins/CustomJsTracker/TrackingCode/PiwikJsManipulator.php

@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomTrackerJs\TrackingCode;
+namespace Piwik\Plugins\CustomJsTracker\TrackingCode;
 
 use Piwik\Piwik;
 

plugins/CustomTrackerJs/TrackingCode/PluginTrackerFiles.php → plugins/CustomJsTracker/TrackingCode/PluginTrackerFiles.php

@@ -5,11 +5,11 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\CustomTrackerJs\TrackingCode;
+namespace Piwik\Plugins\CustomJsTracker\TrackingCode;
 
 use Piwik\Piwik;
 use Piwik\Plugin;
-use Piwik\Plugins\CustomTrackerJs\File;
+use Piwik\Plugins\CustomJsTracker\File;
 
 class PluginTrackerFiles
 {
@@ -92,7 +92,7 @@ protected function shouldIncludeFile($pluginName)
          * @param bool &$shouldAddFile Decides whether the tracker file belonging to the given plugin should be added or not.
          * @param string $pluginName The name of the plugin this file belongs to
          */
-        Piwik::postEvent('CustomTrackerJs.shouldAddTrackerFile', array(&$shouldAddFile, $pluginName));
+        Piwik::postEvent('CustomJsTracker.shouldAddTrackerFile', array(&$shouldAddFile, $pluginName));
 
         /**
          * @todo remove in Matomo 5. For BC only

plugins/CustomTrackerJs/config/config.php → plugins/CustomJsTracker/config/config.php

@@ -2,6 +2,6 @@
 
 return array(
     'diagnostics.optional' => DI\add(array(
-        DI\get('Piwik\Plugins\CustomTrackerJs\Diagnostic\TrackerJsCheck'),
+        DI\get('Piwik\Plugins\CustomJsTracker\Diagnostic\TrackerJsCheck'),
     )),
 );

plugins/CustomTrackerJs/lang/cs.json → plugins/CustomJsTracker/lang/cs.json

@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "Zapisovatelný JavaScript záznam (%s)"
     }
 }

plugins/CustomTrackerJs/lang/da.json → plugins/CustomJsTracker/lang/da.json

@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "JavaScript-sporingsfiler (%s) skrivbare",
         "DiagnosticPiwikJsMakeWritable": "Vi anbefaler at gøre %1$s skrivbare ved at køre denne kommando: %2$s"
     }

plugins/CustomTrackerJs/lang/de.json → plugins/CustomJsTracker/lang/de.json

@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Ermöglicht es jedem Plugin, die Matomo-JavaScript-Tracking-Datei (matomo.js) zu erweitern und neue Funktionalitäts- und Website-Messfunktionen hinzuzufügen.",
         "DiagnosticPiwikJsWritable": "Schreibbarer JavaScript-Tracker (%s)",
         "DiagnosticPiwikJsNotWritable": "Für die Matomo JavaScript-Tracker-Datei %s sind keine Schreibrechte vorhanden , das bedeutet, dass andere Plugins den JavaScript-Tracker nicht erweitern können. In Zukunft könnten sogar einige Kernfunktionen nicht wie erwartet funktionieren.",

plugins/CustomTrackerJs/lang/el.json → plugins/CustomJsTracker/lang/el.json

@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Επιτρέπει σε οποιοδήποτε πρόσθετο να επεκτείνει το αρχείο ιχνηλάτησης σε JavaScript του Matomo (matomo.js) και να προσθέτει νέα λειτουργικότητα και δυνατότητες μετρήσεων των ιστοτόπων.",
         "DiagnosticPiwikJsWritable": "Εγγράψιμο Αρχείο Ιχνηλάτησης JavaScript (%s)",
         "DiagnosticPiwikJsNotWritable": "Το αρχείο ιχνηλάτησης της JavaScript του Matomo %s δεν είναι εγγράψιμο, που σημαίνει ότι άλλα πρόσθετα δεν μπορούν να επεκτείνουν την ιχνηλάτηση. Μελλοντικά ενδέχεται ορισμένα χαρακτηριστικά του πυρήνα να μην λειτουργούν όπως πρέπει.",

plugins/CustomTrackerJs/lang/en.json → plugins/CustomJsTracker/lang/en.json

@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Allows any plugin to extend the Matomo JavaScript Tracking file (matomo.js) and add new functionality and website measurement capabilities.",
         "DiagnosticPiwikJsWritable": "Writable JavaScript Tracker (%s)",
         "DiagnosticPiwikJsNotWritable": "The Matomo JavaScript tracker file %s is not writable which means other plugins cannot extend the JavaScript tracker. In the future even some core features might not work as expected. ",

plugins/CustomTrackerJs/lang/eo.json → plugins/CustomJsTracker/lang/eo.json

@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "Skribebla Sekvanta JavaSkripto (%s)",
         "DiagnosticPiwikJsNotWritable": "La JavaSkriptan sekvanta dosiero %sne stas skriblebla. Pro tio aliaj kromprogramoj ne povas etendi la JavaSkriptan sekvanto. Estontece eĉ kelkaj kernaj funkcioj povus ne funkcii kiel atendite.",
         "DiagnosticPiwikJsMakeWritable": "Ni rekomendas fari %1$sskribebla per funkciado de ĉi tiu komando: %2$s"

plugins/CustomTrackerJs/lang/es-ar.json → plugins/CustomJsTracker/lang/es-ar.json

@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Permite a cualquier plugin extender el archivo de rastreo vía JavaScript de Matomo (\"matomo.js\"), y agrega nuevas capacidades de medición de funcionalidad y sitios web.",
         "DiagnosticPiwikJsWritable": "Rastreador escribible de JavaScript (%s)",
         "DiagnosticPiwikJsNotWritable": "El archivo rastreador vía JavaScript de Matomo %s no es escribible, lo cual significa que otros plugins no pueden extender el rastreador de JavaScript. En el futuro es posible que incluso funciones centrales no funcionen como lo esperado.",