Skip to content

Commit 961b1ac

Browse files
committedJan 14, 2021
PHP 8.0 support added
1 parent e370c21 commit 961b1ac

9 files changed

+55
-20
lines changed
 

‎.travis.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
language: php
22

3-
matrix:
3+
env:
4+
global:
5+
- XDEBUG=YES
6+
- XDEBUG_MODE=coverage
7+
8+
jobs:
49
include:
510
- php: '7.3'
6-
env: XDEBUG=YES
711
- php: '7.4'
8-
env: XDEBUG=YES
12+
- php: '8.0'
913

1014
install:
1115
- mkdir -p ./build/logs

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [Unreleased]
8+
### Added
9+
- PHP 8.0 support.
10+
- UniLex version upgraded to 0.4.0.
11+
712
## [0.6.9] - 2020-04-12
813
### Added
914
- UniLex version updated to 0.3.0.

‎composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
}
1818
],
1919
"require": {
20-
"php": "^7.3",
21-
"remorhaz/php-json-data": "^0.5.2",
22-
"remorhaz/php-unilex": "^0.3"
20+
"php": "^7.3 | ^8",
21+
"remorhaz/php-json-data": "^0.5.3",
22+
"remorhaz/php-unilex": "^0.4"
2323
},
2424
"require-dev": {
25-
"phpunit/phpunit": "^9.1",
26-
"infection/infection": "^0.16",
27-
"squizlabs/php_codesniffer": "^3.5.4"
25+
"phpunit/phpunit": "^9.5",
26+
"infection/infection": "^0.18",
27+
"squizlabs/php_codesniffer": "^3.5"
2828
},
2929
"autoload": {
3030
"psr-4": {

‎docker-compose.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,11 @@ services:
1414
dockerfile: php-7.4.Dockerfile
1515
volumes:
1616
- .:/app
17-
working_dir: /app
17+
working_dir: /app
18+
php8.0:
19+
build:
20+
context: .
21+
dockerfile: php-8.0.Dockerfile
22+
volumes:
23+
- .:/app
24+
working_dir: /app

‎php-7.3.Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ RUN apt-get update && apt-get install -y \
77
pecl install xdebug && \
88
docker-php-ext-enable xdebug && \
99
docker-php-ext-configure intl --enable-intl && \
10-
docker-php-ext-install intl
10+
docker-php-ext-install intl && \
11+
echo "xdebug.mode = develop,coverage,debug" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini"
1112

1213
ENV COMPOSER_ALLOW_SUPERUSER=1 \
1314
COMPOSER_PROCESS_TIMEOUT=1200

‎php-7.4.Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ RUN apt-get update && apt-get install -y \
77
pecl install xdebug && \
88
docker-php-ext-enable xdebug && \
99
docker-php-ext-configure intl --enable-intl && \
10-
docker-php-ext-install intl
10+
docker-php-ext-install intl && \
11+
echo "xdebug.mode = develop,coverage,debug" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini"
1112

1213
ENV COMPOSER_ALLOW_SUPERUSER=1 \
1314
COMPOSER_PROCESS_TIMEOUT=1200

‎php-8.0.Dockerfile

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM php:8.0-cli
2+
3+
RUN apt-get update && apt-get install -y \
4+
zip \
5+
git \
6+
libicu-dev && \
7+
pecl install xdebug && \
8+
docker-php-ext-enable xdebug && \
9+
docker-php-ext-configure intl --enable-intl && \
10+
docker-php-ext-install intl && \
11+
echo "xdebug.mode = develop,coverage,debug" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini"
12+
13+
ENV COMPOSER_ALLOW_SUPERUSER=1 \
14+
COMPOSER_PROCESS_TIMEOUT=1200
15+
16+
RUN curl --silent --show-error https://getcomposer.org/installer | php -- \
17+
--install-dir=/usr/bin --filename=composer

‎phpcs.xml ‎phpcs.xml.dist

File renamed without changes.

‎phpunit.xml.dist

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<phpunit
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.3/phpunit.xsd"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
55
forceCoversAnnotation="true"
66
defaultTestSuite="all"
77
colors="true">
@@ -10,13 +10,13 @@
1010
<directory>tests/</directory>
1111
</testsuite>
1212
</testsuites>
13-
<filter>
14-
<whitelist processUncoveredFilesFromWhitelist="true">
13+
<coverage processUncoveredFiles="true">
14+
<include>
1515
<directory suffix=".php">src/</directory>
1616
<directory suffix=".php">generated/</directory>
17-
<exclude>
18-
<file>generated/LookupTable.php</file>
19-
</exclude>
20-
</whitelist>
21-
</filter>
17+
</include>
18+
<exclude>
19+
<file>generated/LookupTable.php</file>
20+
</exclude>
21+
</coverage>
2222
</phpunit>

0 commit comments

Comments
 (0)