Remove Environment::get method (as it is redundant) and remove Translate class use in EnvironmentValidator (as it doesn't appear to be necessary).

2 files changed, 1 insertions, 15 deletions

diff --git a/core/Application/Environment.php b/core/Application/Environment.php
index 55853d7934..ba9ae00d97 100644
--- a/core/Application/Environment.php
+++ b/core/Application/Environment.php
@@ -100,18 +100,6 @@ class Environment
     }
 
     /**
-     * Returns the Piwik object for this Environment's Piwik instance by ID.
-     *
-     * @param string $id
-     * @return mixed
-     * @throws \DI\NotFoundException
-     */
-    public function get($id)
-    {
-        return $this->container->get($id);
-    }
-
-    /**
      * @link http://php-di.org/doc/container-configuration.html
      */
     private function createContainer()
@@ -168,7 +156,7 @@ class Environment
     private function validateEnvironment()
     {
         /** @var EnvironmentValidator $validator */
-        $validator = $this->get('Piwik\Application\Kernel\EnvironmentValidator');
+        $validator = $this->container->get('Piwik\Application\Kernel\EnvironmentValidator');
         $validator->validate();
     }
 }
\ No newline at end of file
diff --git a/core/Application/Kernel/EnvironmentValidator.php b/core/Application/Kernel/EnvironmentValidator.php
index ef013c7041..c416f189d0 100644
--- a/core/Application/Kernel/EnvironmentValidator.php
+++ b/core/Application/Kernel/EnvironmentValidator.php
@@ -57,8 +57,6 @@ class EnvironmentValidator
             return;
         }
 
-        Translate::loadAllTranslations();
-
         $message = $this->translator->translate('General_ExceptionConfigurationFileNotFound', array($path));
         if (Common::isPhpCliMode()) {
             $message .= "\n" . $this->translator->translate('General_ExceptionConfigurationFileNotFound2', array($path, get_current_user()));