Skip to content

Commit

Permalink
Merge pull request #5 from peckadesign/pdp-2852-povyseni-php-na-7-4
Browse files Browse the repository at this point in the history
Povyseni na php 7.4

- Aktualizace phpstanu
- Odstraneni podpory php 7.0
- Nastaveni minimalnich verzi balicku v composer.json
- Oprava phpstan chyb
  • Loading branch information
Jakub-Fajkus authored Mar 9, 2020
2 parents f76607c + 22f54d1 commit d5af498
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
language: php
php:
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4

script:
- vendor/bin/phpstan analyse -l 5 src
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
}
],
"require": {
"php": "~7.0",
"nette/application": "^2.2",
"nette/di": "^2.2",
"kdyby/console": "^2.3.2",
"php": "~7.1",
"nette/application": "~2.4.14",
"nette/di": "~2.4.14",
"kdyby/console": "~2.7.1",
"supervisorphp/configuration": "~0.2.1"
},
"require-dev": {
"phpstan/phpstan": "~0.6.0"
"phpstan/phpstan": "0.12.11"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 2 additions & 0 deletions src/Console/RenderCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
*/
$configuration = $this->container->getByType(Configuration::class);
$output->write($this->getRenderer()->render($configuration->toArray()));

return 0;
}

}
6 changes: 6 additions & 0 deletions src/Console/WriteCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
$loader->load($configuration);
} catch (LoaderException $exception) {
$output->writeln($exception->getMessage());

return 1;
}
}
if ($writer->write($configuration)) {
$output->writeln(sprintf('Supervisor configuration has been successfully written to file %s', $filesystemAdapter->applyPathPrefix($file)));

return 0;
}

return 1;
}

}

0 comments on commit d5af498

Please sign in to comment.