Applied fixes from StyleCI

kerro · Sep 8, 2015 · f36e5a7 · f36e5a7
1 parent 7cc5e1c
commit f36e5a7
Show file tree

Hide file tree

Showing 53 changed files with 175 additions and 165 deletions.
diff --git a/src/Application/Cli/ClearCommand.php b/src/Application/Cli/ClearCommand.php
@@ -37,13 +37,13 @@ protected function configure()
 
  protected function execute(InputInterface $input, OutputInterface $output)
  {
- $dir = getcwd() . '/.couscous';
+ $dir = getcwd().'/.couscous';
 
  if (file_exists($dir)) {
  $output->writeln("<comment>Deleting folder $dir</comment>");
  $this->filesystem->remove($dir);
  } else {
- $output->writeln("<comment>Nothing to clear</comment>");
+ $output->writeln('<comment>Nothing to clear</comment>');
  }
  }
 }
diff --git a/src/Application/Cli/DeployCommand.php b/src/Application/Cli/DeployCommand.php
@@ -3,9 +3,9 @@
 namespace Couscous\Application\Cli;
 
 use Couscous\CommandRunner\Git;
+use Couscous\Deployer;
 use Couscous\Generator;
 use Couscous\Model\Project;
-use Couscous\Deployer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -42,10 +42,10 @@ class DeployCommand extends Command
 
  public function __construct(Generator $generator, Deployer $deployer, Filesystem $filesystem, Git $git)
  {
- $this->generator  = $generator;
- $this->deployer  = $deployer;
+ $this->generator = $generator;
+ $this->deployer = $deployer;
  $this->filesystem = $filesystem;
- $this->git  = $git;
+ $this->git = $git;
 
  parent::__construct();
  }
@@ -92,10 +92,10 @@ protected function configure()
  protected function execute(InputInterface $input, OutputInterface $output)
  {
  $sourceDirectory = $input->getArgument('source');
- $repositoryUrl  = $input->getOption('repository');
- $targetBranch  = $input->getOption('branch');
+ $repositoryUrl = $input->getOption('repository');
+ $targetBranch = $input->getOption('branch');
 
- $project = new Project($sourceDirectory, getcwd() . '/.couscous/generated');
+ $project = new Project($sourceDirectory, getcwd().'/.couscous/generated');
 
  // Generate the website
  $this->generator->generate($project, $output);

diff --git a/src/Application/Cli/GenerateCommand.php b/src/Application/Cli/GenerateCommand.php
@@ -45,7 +45,7 @@ protected function configure()
  null,
  InputOption::VALUE_REQUIRED,
  'Target directory in which to generate the files.',
- getcwd() . '/.couscous/generated'
+ getcwd().'/.couscous/generated'
  );
  }
 

diff --git a/src/Application/Cli/InitTemplateCommand.php b/src/Application/Cli/InitTemplateCommand.php
@@ -12,8 +12,8 @@
  *
  * @author Ross J. Hagan <[email protected]>
  */
-class InitTemplateCommand extends Command {
-
+class InitTemplateCommand extends Command
+{
  protected function configure()
  {
  $this
@@ -35,28 +35,28 @@ protected function configure()
 
  protected function execute(InputInterface $input, OutputInterface $output)
  {
+ $fileExtension = '.twig';
 
- $fileExtension = '.twig';
-
- $dirName = $input->getArgument('directory');
- $directory = getcwd() . '/' . $dirName . '/';
- $templateName = $input->getArgument('template_name') . $fileExtension;
+ $dirName = $input->getArgument('directory');
+ $directory = getcwd().'/'.$dirName.'/';
+ $templateName = $input->getArgument('template_name').$fileExtension;
 
- $fileLocation  = $directory . $templateName;
- $fileExists  = file_exists($fileLocation);
+ $fileLocation = $directory.$templateName;
+ $fileExists = file_exists($fileLocation);
 
- if (! file_exists(getcwd() . '/' . $dirName)) {
+ if (!file_exists(getcwd().'/'.$dirName)) {
  $output->writeln('<comment>Creating directory.</comment>');
- mkdir(getcwd() . '/' . $dirName);
+ mkdir(getcwd().'/'.$dirName);
  }
 
  if ($fileExists) {
- $output->writeln('<error>That template exists at ' . $fileLocation . ', so nothing has been changed.</error>');
+ $output->writeln('<error>That template exists at '.$fileLocation.', so nothing has been changed.</error>');
  $output->writeln('<error>Try another name!</error>');
+
  return;
  }
 
- if (! $fileExists) {
+ if (!$fileExists) {
  $output->writeln('<comment>Initialising template.</comment>');
  $template = <<<HTML
 <!DOCTYPE html>
@@ -87,7 +87,5 @@ protected function execute(InputInterface $input, OutputInterface $output)
 HTML;
  file_put_contents($fileLocation, $template);
  }
-
  }
-
-}
+}
diff --git a/src/Application/Cli/PreviewCommand.php b/src/Application/Cli/PreviewCommand.php
@@ -56,7 +56,7 @@ protected function configure()
  null,
  InputOption::VALUE_REQUIRED,
  'Target directory in which to generate the files.',
- getcwd() . '/.couscous/generated'
+ getcwd().'/.couscous/generated'
  );
  }
 
@@ -65,8 +65,9 @@ protected function configure()
  */
  protected function execute(InputInterface $input, OutputInterface $output)
  {
- if (! $this->isSupported()) {
+ if (!$this->isSupported()) {
  $output->writeln('<error>PHP 5.4 or above is required to run the internal webserver</error>');
+
  return 1;
  }
 
@@ -120,7 +121,7 @@ private function startWebServer(InputInterface $input, OutputInterface $output,
  $process = $builder->getProcess();
  $process->start();
 
- $output->writeln(sprintf("Server running on <comment>%s</comment>", $input->getArgument('address')));
+ $output->writeln(sprintf('Server running on <comment>%s</comment>', $input->getArgument('address')));
 
  return $process;
  }
@@ -130,6 +131,7 @@ private function isSupported()
  if (version_compare(phpversion(), '5.4.0', '<')) {
  return false;
  }
+
  return true;
  }
 
@@ -142,7 +144,7 @@ private function fileListToDisplay(array $files, $sourceDirectory)
  $str = implode(', ', $files);
 
  if (strlen($str) > 60) {
- $str = substr($str, 0, 60) . '…';
+ $str = substr($str, 0, 60).'…';
  }
 
  return $str;

diff --git a/src/Application/Cli/TravisAutoDeployCommand.php b/src/Application/Cli/TravisAutoDeployCommand.php
@@ -3,8 +3,8 @@
 namespace Couscous\Application\Cli;
 
 use Couscous\CommandRunner\CommandRunner;
-use Couscous\Generator;
 use Couscous\Deployer;
+use Couscous\Generator;
 use Couscous\Model\Project;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -36,8 +36,8 @@ class TravisAutoDeployCommand extends Command
 
  public function __construct(Generator $generator, Deployer $deployer, CommandRunner $commandRunner)
  {
- $this->generator  = $generator;
- $this->deployer  = $deployer;
+ $this->generator = $generator;
+ $this->deployer = $deployer;
  $this->commandRunner = $commandRunner;
 
  parent::__construct();
@@ -79,23 +79,25 @@ protected function configure()
  protected function execute(InputInterface $input, OutputInterface $output)
  {
  $sourceDirectory = $input->getArgument('source');
- $repositoryUrl  = sprintf('https://%s@%s', getenv('GH_TOKEN'), getenv('GH_REF'));
- $targetBranch  = $input->getOption('branch');
+ $repositoryUrl = sprintf('https://%s@%s', getenv('GH_TOKEN'), getenv('GH_REF'));
+ $targetBranch = $input->getOption('branch');
 
- $repository = new Project($sourceDirectory, getcwd() . '/.couscous/generated');
+ $repository = new Project($sourceDirectory, getcwd().'/.couscous/generated');
 
  // verify some env variables
  $travisBranch = getenv('TRAVIS_BRANCH');
 
  if ($travisBranch !== 'master') {
  $output->writeln('<comment>[NOT DEPLOYED] Deploying Couscous only for master branch</comment>');
+
  return;
  }
 
  $isPullRequest = (int) getenv('TRAVIS_PULL_REQUEST') > 0 ? true : false;
 
  if ($isPullRequest) {
  $output->writeln('<comment>[NOT DEPLOYED] Not deploying Couscous for pull requests</comment>');
+
  return;
  }
 
@@ -108,6 +110,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
  $currentPhpVersion = getenv('TRAVIS_PHP_VERSION');
  if ($input->getOption('php-version') != $currentPhpVersion) {
  $output->writeln('<comment>This version of the documentation is already deployed</comment>');
+
  return;
  }
 

diff --git a/src/Application/ContainerFactory.php b/src/Application/ContainerFactory.php
@@ -19,11 +19,11 @@ public function createContainer()
  {
  $builder = new ContainerBuilder();
 
- $builder->addDefinitions(__DIR__ . '/config.php');
+ $builder->addDefinitions(__DIR__.'/config.php');
 
  $moduleConfigs = new Finder();
  $moduleConfigs->files()
- ->in(__DIR__ . '/../Module')
+ ->in(__DIR__.'/../Module')
  ->path('/.+/')
  ->name('config.php');
 

diff --git a/src/Application/config.php b/src/Application/config.php
@@ -1,6 +1,5 @@
 <?php
 
-use Interop\Container\ContainerInterface;
 use Psr\Log\LogLevel;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -55,13 +54,13 @@
  ->constructorParameter('verbosityLevelMap', [
  // Custom verbosity map
  LogLevel::EMERGENCY => OutputInterface::VERBOSITY_NORMAL,
- LogLevel::ALERT => OutputInterface::VERBOSITY_NORMAL,
- LogLevel::CRITICAL => OutputInterface::VERBOSITY_NORMAL,
- LogLevel::ERROR => OutputInterface::VERBOSITY_NORMAL,
- LogLevel::WARNING => OutputInterface::VERBOSITY_NORMAL,
- LogLevel::NOTICE => OutputInterface::VERBOSITY_NORMAL,
- LogLevel::INFO => OutputInterface::VERBOSITY_VERBOSE,
- LogLevel::DEBUG => OutputInterface::VERBOSITY_VERY_VERBOSE,
+ LogLevel::ALERT  => OutputInterface::VERBOSITY_NORMAL,
+ LogLevel::CRITICAL  => OutputInterface::VERBOSITY_NORMAL,
+ LogLevel::ERROR  => OutputInterface::VERBOSITY_NORMAL,
+ LogLevel::WARNING  => OutputInterface::VERBOSITY_NORMAL,
+ LogLevel::NOTICE  => OutputInterface::VERBOSITY_NORMAL,
+ LogLevel::INFO  => OutputInterface::VERBOSITY_VERBOSE,
+ LogLevel::DEBUG  => OutputInterface::VERBOSITY_VERY_VERBOSE,
  ]),
 
 ];
diff --git a/src/CommandRunner/CommandRunner.php b/src/CommandRunner/CommandRunner.php
@@ -12,15 +12,16 @@ class CommandRunner
  /**
  * Runs a command.
  *
- * @throws CommandException When the command exit code is not zero.
  *
  * @param string $command The command to be executed.
  *
+ * @throws CommandException When the command exit code is not zero.
+ *
  * @return string Output of the command.
  */
  public function run($command)
  {
- exec($command . ' 2>&1', $output, $returnValue);
+ exec($command.' 2>&1', $output, $returnValue);
 
  $output = implode(PHP_EOL, $output);
 

diff --git a/src/CommandRunner/Git.php b/src/CommandRunner/Git.php
@@ -46,6 +46,7 @@ public function push($directory, $branch, $remote = 'origin')
 
  /**
  * @param string $remote Remote name
+ *
  * @return string The git URL
  */
  public function getRemoteUrl($remote = 'origin')

diff --git a/src/Deployer.php b/src/Deployer.php
@@ -29,7 +29,7 @@ class Deployer
  public function __construct(Filesystem $filesystem, Git $git)
  {
  $this->filesystem = $filesystem;
- $this->git  = $git;
+ $this->git = $git;
  }
 
  /**
@@ -40,9 +40,9 @@ public function __construct(Filesystem $filesystem, Git $git)
  */
  public function deploy(Project $project, OutputInterface $output, $repositoryUrl, $branch)
  {
- $output->writeln("<comment>Deploying the website</comment>");
+ $output->writeln('<comment>Deploying the website</comment>');
 
- $directory  = $project->targetDirectory;
+ $directory = $project->targetDirectory;
  $tmpDirectory = $this->createTempDirectory();
 
  $this->cloneRepository($output, $repositoryUrl, $tmpDirectory);
@@ -86,7 +86,7 @@ private function checkoutBranch(OutputInterface $output, $branch, $tmpDirectory)
  try {
  $this->git->createBranch($tmpDirectory, $branch);
  } catch (CommandException $e) {
- throw new \RuntimeException("Unable to create the branch '$branch'" . PHP_EOL . $e->getMessage());
+ throw new \RuntimeException("Unable to create the branch '$branch'".PHP_EOL.$e->getMessage());
  }
  }
  }

diff --git a/src/Generator.php b/src/Generator.php
@@ -24,19 +24,19 @@ class Generator
  private $steps;
 
  /**
- * @param Filesystem  $filesystem
- * @param Step[] $steps
+ * @param Filesystem $filesystem
+ * @param Step[]  $steps
  */
  public function __construct(Filesystem $filesystem, array $steps)
  {
  $this->filesystem = $filesystem;
- $this->steps  = $steps;
+ $this->steps = $steps;
  }
 
  public function generate(Project $project, OutputInterface $output)
  {
  $output->writeln(sprintf(
- "<comment>Generating %s to %s</comment>",
+ '<comment>Generating %s to %s</comment>',
  $project->sourceDirectory,
  $project->targetDirectory
  ));

diff --git a/src/Model/File.php b/src/Model/File.php
@@ -40,7 +40,7 @@ public function getBasename()
  public function getDirectory()
  {
  $directory = dirname($this->relativeFilename);
- $directory = ($directory === '.') ? '' : $directory . '/';
+ $directory = ($directory === '.') ? '' : $directory.'/';
 
  return $directory;
  }
@@ -50,7 +50,7 @@ public function getDirectory()
  *
  * @return string
  */
- public abstract function getContent();
+ abstract public function getContent();
 
  /**
  * Returns an indexed array of metadata.