Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,22 @@ RUN apk --update add \
php7-openssl \
php7-pcntl \
php7-phar \
php7-simplexml \
php7-sockets \
php7-tokenizer \
php7-xmlwriter \
php7-xml && \
rm /var/cache/apk/* && \
ln -s /usr/bin/php7 /usr/bin/php
ln -sf /usr/bin/php7 /usr/bin/php

COPY composer.* ./

RUN apk --update add curl && \
curl -sS https://getcomposer.org/installer | php && \
./composer.phar install && \
mv composer.phar /usr/local/bin/composer && \
apk del curl && \
rm /usr/src/app/composer.phar \
/var/cache/apk/*
rm /var/cache/apk/*

COPY bin/build-content ./bin/build-content

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ composer-update:
--rm \
--volume $(PWD)/composer.json:/usr/src/app/composer.json:ro \
$(IMAGE_NAME) \
sh -c 'php composer.phar update && cat composer.lock' > composer.lock
sh -c 'cd /usr/src/app && composer update && cat composer.lock' > composer.lock

citest:
docker run --rm $(IMAGE_NAME) sh -c "cd /usr/src/app && vendor/bin/phpunit --bootstrap engine.php ./tests"
Expand Down
8 changes: 7 additions & 1 deletion Runner.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,13 @@ public function run($files)
$phpmd = new PHPMD();

if (isset($this->config['config']['file_extensions'])) {
$phpmd->setFileExtensions(explode(',', $this->config['config']['file_extensions']));
$fileExtensions = $this->config['config']['file_extensions'];

if (is_string($fileExtensions)) {
$fileExtensions = explode(',', $fileExtensions);
}

$phpmd->setFileExtensions($fileExtensions);
}

$rulesets = Runner::RULESETS;
Expand Down
Loading