Skip to content

Commit

Permalink
Merge pull request #34 from madewithlove/use-php-81-by-default
Browse files Browse the repository at this point in the history
Use php 81 by default
  • Loading branch information
jdrieghe authored Jan 3, 2022
2 parents 15fd0bd + 15580f6 commit 5856b78
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@master
- uses: shivammathur/setup-php@master
with:
php-version: '8.0'
php-version: '8.1'
- name: Install dependencies
run: composer update
- name: Run Psalm
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
- uses: actions/checkout@master
- uses: shivammathur/setup-php@master
with:
php-version: '8.0'
php-version: '8.1'
- name: Install dependencies
run: composer update
- name: Run License Checker
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8-cli-alpine
FROM php:8.1-cli-alpine

ENV COMPOSER_HOME /composer
ENV COMPOSER_ALLOW_SUPERUSER 1
Expand Down
4 changes: 2 additions & 2 deletions bin/license-checker
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ foreach ($potentialAutoLoaderFiles as $potentialAutoLoaderFile) {
}
}

if (!$autoLoader) {
if (!isset($autoLoader)) {
throw new RuntimeException('vendor/autoload.php could not be found. Did you run `composer install`?');
}

$application = new Application('License Checker', '0.0.1');
$application = new Application('License Checker', '1.2.0');

$allowedLicensesParser = new AllowedLicensesParser(getcwd());
$usedLicensesParser = new UsedLicensesParser(new UsedLicensesRetriever());
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/GenerateConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
try {
/** @var string|null $fileName */
$fileName = is_string($input->getOption('filename')) ? $input->getOption('filename') : null;
$this->allowedLicensesParser->writeConfiguration(array_values($usedLicenses), $fileName);
$this->allowedLicensesParser->writeConfiguration($usedLicenses, $fileName);
$io->success('Configuration file successfully written');
} catch (ConfigurationExists $e) {
$io->error('The configuration file already exists. Please remove it before generating a new one.');
Expand Down

0 comments on commit 5856b78

Please sign in to comment.