Skip to content

Commit 9058a3b

Browse files
committed
Add PHP 8 support
1 parent 9b7ea49 commit 9058a3b

File tree

5 files changed

+37
-19
lines changed

5 files changed

+37
-19
lines changed

.travis.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
sudo: required
2-
3-
language: bash
4-
5-
services:
6-
- docker
1+
os: linux
2+
language: shell
3+
services: [docker]
74

85
env:
96
global:
10-
TNT_IMAGE='tarantool/tarantool:2.4'
7+
TNT_IMAGE='tarantool/tarantool:2.6'
8+
PHP_IMAGE='php:8.0-cli'
119

12-
matrix:
10+
jobs:
1311
- PHP_IMAGE='php:7.1-cli'
1412
- PHP_IMAGE='php:7.2-cli'
1513
- PHP_IMAGE='php:7.3-cli' QA=1
1614
- PHP_IMAGE='php:7.4-cli' COVERAGE_FILE='coverage.clover'
15+
- PHP_IMAGE='php:8.0-cli'
1716

18-
- PHP_IMAGE='php:7.4-cli' TNT_IMAGE='tarantool/tarantool:1.7'
19-
- PHP_IMAGE='php:7.4-cli' TNT_IMAGE='tarantool/tarantool:1.9'
20-
- PHP_IMAGE='php:7.4-cli' TNT_IMAGE='tarantool/tarantool:1'
21-
- PHP_IMAGE='php:7.4-cli' TNT_IMAGE='tarantool/tarantool:2.1'
22-
- PHP_IMAGE='php:7.4-cli' TNT_IMAGE='tarantool/tarantool:2.3'
17+
- TNT_IMAGE='tarantool/tarantool:1.7'
18+
- TNT_IMAGE='tarantool/tarantool:1.9'
19+
- TNT_IMAGE='tarantool/tarantool:1'
20+
- TNT_IMAGE='tarantool/tarantool:2.1'
21+
- TNT_IMAGE='tarantool/tarantool:2.3'
22+
- TNT_IMAGE='tarantool/tarantool:2.4'
23+
- TNT_IMAGE='tarantool/tarantool:2.5'
2324

2425
install:
2526
- ./dockerfile.sh | tee /dev/tty | docker build -t queue -
@@ -30,7 +31,8 @@ script:
3031
- docker run -d --net=tarantool-php --name=tarantool -v `pwd`:/queue -e TNT_LISTEN_URI=$TNT_LISTEN_URI ${TNT_IMAGE} tarantool /queue/tests/Integration/queues.lua
3132
- docker run --rm --net=tarantool-php -v `pwd`:/queue -w /queue queue
3233
- if [[ -n "$QA" ]]; then
33-
docker run --net=tarantool-php --rm -v $(pwd):/queue -w /queue queue php vendor/bin/php-cs-fixer fix --dry-run --diff --verbose .;
34+
docker run --net=tarantool-php --rm -v $PWD:/queue -w /queue queue php vendor/bin/php-cs-fixer fix --dry-run --diff --verbose . &&
35+
docker run --net=tarantool-php --rm -v $PWD:/queue -w /queue queue php vendor/bin/psalm;
3436
fi
3537

3638
after_script:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Tarantool Queue
22

3-
[![Build Status](https://travis-ci.org/tarantool-php/queue.svg?branch=master)](https://travis-ci.org/tarantool-php/queue)
3+
[![Build Status](https://travis-ci.com/tarantool-php/queue.svg?branch=master)](https://travis-ci.com/tarantool-php/queue)
44
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/tarantool-php/queue/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/tarantool-php/queue/?branch=master)
55
[![Code Coverage](https://scrutinizer-ci.com/g/tarantool-php/queue/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/tarantool-php/queue/?branch=master)
66
[![Mentioned in Awesome PHP](https://awesome.re/mentioned-badge.svg)](https://github.com/ziadoz/awesome-php)

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
}
1212
],
1313
"require": {
14-
"php": "^7.1",
15-
"tarantool/client": "^0.7"
14+
"php": "^7.1|^8",
15+
"tarantool/client": "^0.7|^0.8|^0.9"
1616
},
1717
"require-dev": {
1818
"friendsofphp/php-cs-fixer": "^2.14",
1919
"rybakit/msgpack": "^0.7",
20-
"tarantool/phpunit-extras": "^0.1"
20+
"tarantool/phpunit-extras": "^0.1",
21+
"vimeo/psalm": "^3.9|^4"
2122
},
2223
"autoload": {
2324
"psr-4": {

dockerfile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
if [[ -z "$PHP_IMAGE" ]] ; then
4-
PHP_IMAGE='php:7.4-cli'
4+
PHP_IMAGE='php:8.0-cli'
55
fi
66

77
if [[ -z "$TNT_LISTEN_URI" ]]; then

psalm.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<psalm
3+
errorLevel="7"
4+
resolveFromConfigFile="true"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6+
xmlns="https://getpsalm.org/schema/config"
7+
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
8+
>
9+
<projectFiles>
10+
<directory name="src" />
11+
<ignoreFiles>
12+
<directory name="vendor" />
13+
</ignoreFiles>
14+
</projectFiles>
15+
</psalm>

0 commit comments

Comments
 (0)