Revert "Injection of dependencies through annotations in controllers"

This reverts commit 3668fde1861f0a192e794316e7ce848c6512bf76.

2 files changed, 4 insertions, 14 deletions

diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 53039c3216..0dffcd343c 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -53,12 +53,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     );
 
     /**
-     * @Inject
-     * @var TrackerCodeGenerator
-     */
-    private $trackerGenerator;
-
-    /**
      * Get installation steps
      *
      * @return array installation steps
@@ -382,7 +376,8 @@ 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;
-        $viewTrackingHelp->jsTag = $this->trackerGenerator->generate($idSite, Url::getCurrentUrlWithoutFileName());
+        $javascriptGenerator = new TrackerCodeGenerator();
+        $viewTrackingHelp->jsTag = $javascriptGenerator->generate($idSite, Url::getCurrentUrlWithoutFileName());
         $viewTrackingHelp->idSite = $idSite;
         $viewTrackingHelp->piwikUrl = Url::getCurrentUrlWithoutFileName();
 
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index cca2f1ff19..e7299ab03e 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -23,12 +23,6 @@ use Piwik\View;
 class Controller extends \Piwik\Plugin\ControllerAdmin
 {
     /**
-     * @Inject
-     * @var TrackerCodeGenerator
-     */
-    private $trackerGenerator;
-
-    /**
      * Main view showing listing of websites and settings
      */
     public function index()
@@ -102,7 +96,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     {
         $idSite = Common::getRequestVar('idSite');
         Piwik::checkUserHasViewAccess($idSite);
-        $jsTag = $this->trackerGenerator->generate($idSite, SettingsPiwik::getPiwikUrl());
+        $javascriptGenerator = new TrackerCodeGenerator();
+        $jsTag = $javascriptGenerator->generate($idSite, SettingsPiwik::getPiwikUrl());
         $site  = new Site($idSite);
 
         return $this->renderTemplate('displayJavascriptCode', array(