1
0
mirror of https://github.com/halaxa/json-machine.git synced 2025-03-15 08:59:39 +01:00

Merge branch 'php8'

This commit is contained in:
Filip Halaxa 2020-11-08 12:29:04 +01:00
commit c6f37b2fe9
5 changed files with 12 additions and 9 deletions

View File

@ -7,6 +7,8 @@ php:
- 7.2
- 7.3
- 7.4
- nightly
install:
- composer update
- composer self-update --2
- composer update --ignore-platform-req=php

View File

@ -12,7 +12,7 @@
"php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"phpunit/phpunit": "^5.7.27",
"guzzlehttp/guzzle": "^6",
"ext-json": "*"
},

View File

@ -4,7 +4,7 @@ namespace JsonMachine\Exception;
class SyntaxError extends \RuntimeException
{
public function __construct($message = "", $position)
public function __construct($message, $position)
{
parent::__construct($message." At position $position.");
}

View File

@ -7,7 +7,8 @@ for VERSION in \
7.1:2.9.0 \
7.2:2.9.0 \
7.3:2.9.0 \
7.4:2.9.0
7.4:2.9.0 \
8.0-rc:3.0.0beta1
do
set -- $VERSION
PHP_VERSION=$1
@ -37,10 +38,10 @@ do
autoconf \
g++ \
libtool \
make \
&& pecl install xdebug-$XDEBUG_VERSION \
&& docker-php-ext-enable xdebug \
&& wget https://getcomposer.org/composer.phar -O /usr/local/bin/composer \
make
RUN wget http://pear.php.net/go-pear.phar && php go-pear.phar
RUN pecl install xdebug-$XDEBUG_VERSION
RUN wget https://getcomposer.org/composer.phar -O /usr/local/bin/composer \
&& chmod +x /usr/local/bin/composer
" | docker build --tag "$CONTAINER_NAME" - > /dev/null
printf "Running tests...\n"

View File

@ -1,3 +1,3 @@
#!/usr/bin/env sh
printf "$(php -v | head -n 1)\n"
composer update && vendor/bin/phpunit --colors
composer update --ignore-platform-req=php && vendor/bin/phpunit --colors