Skip to content
Extraits de code Groupes Projets
Valider 051722a0 rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Remove dependency on Piwik DI in generate:travis-yml command (for travis...

Remove dependency on Piwik DI in generate:travis-yml command (for travis builds against older piwik versions).
parent f57171e8
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -8,7 +8,6 @@
namespace Piwik\Plugins\TestRunner\TravisYml;
use Exception;
use Piwik\Container\StaticContainer;
use Piwik\Plugins\TestRunner\Commands\GenerateTravisYmlFile;
use Psr\Log\LoggerInterface;
......@@ -25,7 +24,7 @@ abstract class Generator
/**
* @var LoggerInterface
*/
protected $logger;
private $logger;
/**
* @var TravisYmlView
......@@ -40,7 +39,9 @@ abstract class Generator
public function __construct($options)
{
$this->options = $options;
$this->logger = StaticContainer::get('Psr\Log\LoggerInterface');
if (class_exists('\Piwik\Container\StaticContainer')) {
$this->logger = \Piwik\Container\StaticContainer::get('Psr\Log\LoggerInterface');
}
$this->view = new TravisYmlView();
}
......@@ -99,13 +100,13 @@ abstract class Generator
$outputYmlPath = $this->getTravisYmlOutputPath();
if (file_exists($outputYmlPath)) {
$this->logger->info("Found existing YAML file at {path}.", array('path' => $outputYmlPath));
$this->log('info', "Found existing YAML file at {path}.", array('path' => $outputYmlPath));
$parser = new Parser();
$existingSections = $parser->processExistingTravisYml($outputYmlPath);
$this->view->setExistingSections($existingSections);
} else {
$this->logger->info("Could not find existing YAML file at {path}, generating a new one.", array('path' => $outputYmlPath));
$this->log('info', "Could not find existing YAML file at {path}, generating a new one.", array('path' => $outputYmlPath));
}
$this->setExtraEnvironmentVariables();
......@@ -113,7 +114,7 @@ abstract class Generator
protected function travisEncrypt($data)
{
$this->logger->info("Encrypting \"{data}\"...", array('data' => $data));
$this->log('info', "Encrypting \"{data}\"...", array('data' => $data));
$command = "travis encrypt \"$data\"";
......@@ -171,7 +172,7 @@ abstract class Generator
private function setExtraEnvironmentVariables()
{
if (!empty($this->view->existingEnv)) {
$this->logger->info("Existing .yml file found, ignoring global variables specified on command line.");
$this->log('info', "Existing .yml file found, ignoring global variables specified on command line.");
return;
}
......@@ -198,4 +199,11 @@ abstract class Generator
unset($options['dump']);
return $options;
}
protected function log($level, $message, $params = array())
{
if ($this->logger) {
$this->logger->$level($message, $params);
}
}
}
\ No newline at end of file
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter