Skip to content

Commit 9d5b92c

Browse files
committed
PHP 8.0 support added
1 parent 9d9f2be commit 9d5b92c

10 files changed

+53
-21
lines changed

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
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
12-
- composer self-update
1316
- composer install --prefer-source --no-interaction
1417

1518
script:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ 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+
711
## [0.5.1] - 2019-02-17
812
### Added
913
- Upgraded `remorhaz/php-json-pointer`.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016-2019 Edward Surov
3+
Copyright (c) 2016-2021 Edward Surov
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.3",
19+
"php": "^7.3 | ^8",
2020
"ext-intl": "*",
21-
"remorhaz/php-json-data": "^0.5.2",
22-
"remorhaz/php-json-pointer": "^0.6.8"
21+
"remorhaz/php-json-data": "^0.5.3",
22+
"remorhaz/php-json-pointer": "^0.6.10"
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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,17 @@ services:
88
volumes:
99
- .:/app
1010
working_dir: /app
11-
php-7.4:
11+
php7.4:
1212
build:
1313
context: .
1414
dockerfile: php-7.4.Dockerfile
1515
volumes:
1616
- .:/app
1717
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 17 additions & 0 deletions
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
File renamed without changes.

phpunit.xml.dist

Lines changed: 6 additions & 7 deletions
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/9.1/phpunit.xsd"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
55
forceCoversAnnotation="true"
66
colors="true"
77
defaultTestSuite="unit">
@@ -10,10 +10,9 @@
1010
<directory>tests/</directory>
1111
</testsuite>
1212
</testsuites>
13-
<filter>
14-
<whitelist
15-
processUncoveredFilesFromWhitelist="true">
13+
<coverage processUncoveredFiles="true">
14+
<include>
1615
<directory suffix=".php">src/</directory>
17-
</whitelist>
18-
</filter>
19-
</phpunit>
16+
</include>
17+
</coverage>
18+
</phpunit>

0 commit comments

Comments
 (0)