Skip to content

Commit

Permalink
Update dependencies (#23)
Browse files Browse the repository at this point in the history
  • Loading branch information
vearutop authored Dec 13, 2020
1 parent 8ff748c commit 8144314
Show file tree
Hide file tree
Showing 11 changed files with 246 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: php
php:
- nightly
- 8.0
- 7.4
- 7.3
- 7.2
Expand All @@ -26,7 +26,7 @@ matrix:
fast_finish: true

script:
- php -derror_reporting="E_ALL & ~E_DEPRECATED" ./vendor/bin/phpunit -v --configuration phpunit.xml --coverage-text --coverage-clover=coverage.xml
- php -derror_reporting="E_ALL & ~E_DEPRECATED" -dxdebug.mode=coverage ./vendor/bin/phpunit -v --configuration phpunit.xml --coverage-text --coverage-clover=coverage.xml
- if [[ $(phpenv version-name) =~ 7.2 ]] ; then make lint; fi

after_script:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.8.1] - 2020-12-13

### Added
- Dependencies updated.

## [1.8.0] - 2020-09-30

### Added
Expand Down Expand Up @@ -145,6 +150,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Local file resolver in references.

[1.8.1]: https://github.com/swaggest/json-cli/compare/v1.8.0...v1.8.1
[1.8.0]: https://github.com/swaggest/json-cli/compare/v1.7.13...v1.8.0
[1.7.13]: https://github.com/swaggest/json-cli/compare/v1.7.12...v1.7.13
[1.7.12]: https://github.com/swaggest/json-cli/compare/v1.7.11...v1.7.12
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
PHPSTAN_VERSION ?= 0.12.60

phar:
@test -f $$HOME/.cache/composer/phar-composer.phar || (mkdir -p $$HOME/.cache/composer/ && wget https://github.com/clue/phar-composer/releases/download/v1.0.0/phar-composer.phar -O $$HOME/.cache/composer/phar-composer.phar)
@test -f $$HOME/.cache/composer/phar-composer.phar || (mkdir -p $$HOME/.cache/composer/ && wget https://github.com/clue/phar-composer/releases/download/v1.2.0/phar-composer-1.2.0.phar -O $$HOME/.cache/composer/phar-composer.phar)
@composer install --no-dev;rm -rf vendor/salsify/json-streaming-parser/tests;rm -f vendor/salsify/json-streaming-parser/phpunit;rm -rf tests/;rm ./json-cli;rm ./json-cli.tar.gz;php -d phar.readonly=off $$HOME/.cache/composer/phar-composer.phar build;mv ./json-cli.phar ./json-cli;tar -zcvf ./json-cli.tar.gz ./json-cli;git reset --hard;composer install

docker-build:
Expand All @@ -11,8 +13,8 @@ docker-push:
@docker push swaggest/json-cli:$(shell git describe --abbrev=0 --tags)

lint:
@test -f $$HOME/.cache/composer/phpstan-0.11.8.phar || (mkdir -p $$HOME/.cache/composer/ && wget https://github.com/phpstan/phpstan/releases/download/0.11.8/phpstan.phar -O $$HOME/.cache/composer/phpstan-0.11.8.phar)
@php $$HOME/.cache/composer/phpstan-0.11.8.phar analyze -l 7 -c phpstan.neon ./src
@test -f ${HOME}/.cache/composer/phpstan-${PHPSTAN_VERSION}.phar || (mkdir -p ${HOME}/.cache/composer/ && wget https://github.com/phpstan/phpstan/releases/download/${PHPSTAN_VERSION}/phpstan.phar -O ${HOME}/.cache/composer/phpstan-${PHPSTAN_VERSION}.phar)
@php $$HOME/.cache/composer/phpstan-${PHPSTAN_VERSION}.phar analyze -l 7 -c phpstan.neon ./src

docker-lint:
@docker run -v $$PWD:/app --rm phpstan/phpstan analyze -l 7 -c phpstan.neon ./src
Expand All @@ -21,4 +23,4 @@ test:
@php -derror_reporting="E_ALL & ~E_DEPRECATED" vendor/bin/phpunit

test-coverage:
@php -derror_reporting="E_ALL & ~E_DEPRECATED" -dzend_extension=xdebug.so vendor/bin/phpunit --coverage-text
@php -derror_reporting="E_ALL & ~E_DEPRECATED" -dzend_extension=xdebug.so -dxdebug.mode=coverage vendor/bin/phpunit --coverage-text
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"symfony/yaml": "^3",
"salsify/json-streaming-parser": "^7.0",
"swaggest/json-schema": "^0.12.21",
"swaggest/go-code-builder": "^0.4.40",
"swaggest/go-code-builder": "^0.4.42",
"swaggest/php-code-builder": "^0.2.8",
"swaggest/code-builder": "^0.3.2",
"swaggest/json-schema-maker": "^0.3.4"
Expand Down
Loading

0 comments on commit 8144314

Please sign in to comment.