Skip to content

Commit 6971a40

Browse files
committed
Merge remote-tracking branch 'origin/php8'
2 parents c7cd185 + c994ef7 commit 6971a40

4 files changed

Lines changed: 15 additions & 14 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
strategy:
9+
fail-fast: false
910
matrix:
10-
php: [7.3, 7.4, "8.0", 8.1]
11-
symfony_process: [3.4, 4.0, 5.0, 6.0]
11+
php: [7.3, 7.4, "8.0", 8.1, 8.2]
12+
symfony_process: [4.0, 5.0, 6.0]
1213
exclude:
1314
- php: 7.3
1415
symfony_process: 6

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ FROM php:$PHP_VERSION-cli-alpine
33

44
RUN apk add git zip unzip autoconf make g++
55

6-
RUN if [ -z "${PHP_VERSION##7\.1*}" ]; then \
7-
pecl install xdebug-2.9.8 && docker-php-ext-enable xdebug; \
8-
else \
9-
pecl install xdebug && docker-php-ext-enable xdebug; \
10-
fi;
11-
126
RUN curl -sS https://getcomposer.org/installer | php \
137
&& mv composer.phar /usr/local/bin/composer
148

159
WORKDIR /package
1610

17-
COPY composer.json ./
11+
RUN adduser -D -g '' dev
12+
13+
RUN chown dev -R /package
14+
15+
USER dev
16+
17+
COPY --chown=dev composer.json ./
1818

1919
ARG SYMFONY_PROCESS=5
2020
RUN composer require symfony/process ^$SYMFONY_PROCESS.0
2121

2222
RUN composer install
2323

24-
COPY . .
24+
COPY --chown=dev . .
2525

2626
RUN composer test

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"require": {
1313
"php": "^7.3|^8.0|^8.1",
14-
"symfony/process": "~3.4 || ~4.0 || ~5.0 || ~6.0",
14+
"symfony/process": "~4.0 || ~5.0 || ~6.0",
1515
"guzzlehttp/guzzle": "^6.3 || ^7.0"
1616
},
1717
"autoload": {
@@ -22,7 +22,7 @@
2222
},
2323
"require-dev": {
2424
"phpunit/phpunit": "^9.0",
25-
"phpstan/phpstan": "^0.12.83"
25+
"phpstan/phpstan": "^1.9"
2626
},
2727
"scripts": {
2828
"test": [

src/Chrome.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ private function getCommandFlags(): array
139139
$opts[] = "--no-displayHeaderFooter";
140140
}
141141
if ($this->getHeader()) {
142-
$headerFile = $this->getFileForString($this->getHeader() ?: '');
142+
$headerFile = $this->getFileForString($this->getHeader());
143143
$opts[] = "--headerTemplate";
144144
$opts[] = $headerFile;
145145
}
146146
if ($this->getFooter()) {
147-
$footerFile = $this->getFileForString($this->getFooter() ?: '');
147+
$footerFile = $this->getFileForString($this->getFooter());
148148
$opts[] = "--footerTemplate";
149149
$opts[] = $footerFile;
150150
}

0 commit comments

Comments
 (0)