Injection of dependencies through annotations in controllers

plugins/Installation/Controller.php

@@ -52,6 +52,12 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         'finished'          => 'Installation_Congratulations',
     );
 
+    /**
+     * @Inject
+     * @var TrackerCodeGenerator
+     */
+    private $trackerGenerator;
+
     /**
      * Get installation steps
      *
@@ -376,8 +382,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         // Load the Tracking code and help text from the SitesManager
         $viewTrackingHelp = new \Piwik\View('@SitesManager/_displayJavascriptCode');
         $viewTrackingHelp->displaySiteName = $siteName;
-        $javascriptGenerator = new TrackerCodeGenerator();
-        $viewTrackingHelp->jsTag = $javascriptGenerator->generate($idSite, Url::getCurrentUrlWithoutFileName());
+        $viewTrackingHelp->jsTag = $this->trackerGenerator->generate($idSite, Url::getCurrentUrlWithoutFileName());
         $viewTrackingHelp->idSite = $idSite;
         $viewTrackingHelp->piwikUrl = Url::getCurrentUrlWithoutFileName();
 

plugins/SitesManager/Controller.php

@@ -22,6 +22,12 @@ use Piwik\View;
  */
 class Controller extends \Piwik\Plugin\ControllerAdmin
 {
+    /**
+     * @Inject
+     * @var TrackerCodeGenerator
+     */
+    private $trackerGenerator;
+
     /**
      * Main view showing listing of websites and settings
      */
@@ -96,8 +102,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     {
         $idSite = Common::getRequestVar('idSite');
         Piwik::checkUserHasViewAccess($idSite);
-        $javascriptGenerator = new TrackerCodeGenerator();
-        $jsTag = $javascriptGenerator->generate($idSite, SettingsPiwik::getPiwikUrl());
+        $jsTag = $this->trackerGenerator->generate($idSite, SettingsPiwik::getPiwikUrl());
         $site  = new Site($idSite);
 
         return $this->renderTemplate('displayJavascriptCode', array(