Skip to content

Commit

Permalink
Upgraded dependencies and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Wizofgoz committed Jun 16, 2020
1 parent 5de6500 commit 261e619
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 4,054 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

# Composer
/vendor/
composer.lock

# Test
/build
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
language: php

php:
- '5.6'
- '7.0'
- '7.1'
- '7.2'
- '7.3'
- '7.4'

install:
- composer install
Expand Down
26 changes: 8 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# OpenTracing for Laravel

[![Total Downloads](https://img.shields.io/packagist/dt/taisph/laravel-opentracing.svg?style=flat-square)](https://packagist.org/packages/taisph/laravel-opentracing)
[![Latest Stable Version](https://img.shields.io/packagist/v/taisph/laravel-opentracing.svg?style=flat-square)](https://packagist.org/packages/taisph/laravel-opentracing)
[![StyleCI](https://github.styleci.io/repos/139591541/shield?style=flat-square&branch=develop)](https://github.styleci.io/repos/139591541)
[![Build Status](https://img.shields.io/travis/taisph/laravel-opentracing/master.svg?style=flat-square)](https://travis-ci.org/taisph/laravel-opentracing)
[![Coverage Status](https://img.shields.io/coveralls/github/taisph/laravel-opentracing/master.svg?style=flat-square)](https://coveralls.io/github/taisph/laravel-opentracing?branch=develop)
[![Total Downloads](https://img.shields.io/packagist/dt/wizofgoz/laravel-opentracing.svg?style=flat-square)](https://packagist.org/packages/wizofgoz/laravel-opentracing)
[![Latest Stable Version](https://img.shields.io/packagist/v/wizofgoz/laravel-opentracing.svg?style=flat-square)](https://packagist.org/packages/wizofgoz/laravel-opentracing)
[![StyleCI](https://github.styleci.io/repos/271911972/shield?style=flat-square&branch=develop)](https://github.styleci.io/repos/271911972)
[![Build Status](https://img.shields.io/travis/wizofgoz/laravel-opentracing/master.svg?style=flat-square)](https://travis-ci.org/wizofgoz/laravel-opentracing)
[![Coverage Status](https://img.shields.io/coveralls/github/wizofgoz/laravel-opentracing/master.svg?style=flat-square)](https://coveralls.io/github/wizofgoz/laravel-opentracing?branch=develop)

Reference implementation of the OpenTracing API for Laravel including a server-less local tracer for application
logging purposes.
Expand All @@ -19,22 +19,12 @@ Currently supported clients:
- Jaeger: open source, end-to-end distributed tracing. See [Jaeger](https://www.jaegertracing.io/) and
Jonah George's [Jaeger Client PHP](https://github.com/jonahgeorge/jaeger-client-php).

Note that a patched version of Jaeger Client PHP is currently required to retain PHP 5.6 support. If you need that in
your application, add the config below to your `composer.json` file in the `repositories` section.

```json
{
"type": "vcs",
"url": "https://github.com/taisph/jaeger-client-php"
}
```

## Installation

Install the latest version using:

```bash
composer require taisph/laravel-opentracing
composer require wizofgoz/laravel-opentracing
```

Copy the default configuration file to your application if you want to change it by running the command below. Note
Expand Down Expand Up @@ -175,13 +165,13 @@ new \GuzzleHttp\Client(

## Testing

docker run --rm -it -v $(pwd):/app php:5.6-cli-alpine /bin/sh -c 'apk add --no-cache $PHPIZE_DEPS && pecl install xdebug-2.5.5 && cd app && php -dzend_extension=xdebug.so vendor/bin/phpunit'
docker run --rm -it -v $(pwd):/app php:7.3-cli-alpine /bin/sh -c 'apk add --no-cache $PHPIZE_DEPS && pecl install xdebug-2.7.2 && cd app && php -dzend_extension=xdebug.so vendor/bin/phpunit'

## About

### Requirements

- PHP 5.6 or newer.
- PHP 7.3 or newer.

### Contributions

Expand Down
26 changes: 10 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "taisph/laravel-opentracing",
"name": "wizofgoz/laravel-opentracing",
"description": "",
"keywords": [
"opentracing",
Expand All @@ -9,30 +9,24 @@
"license": "Apache-2.0",
"authors": [
{
"name": "Tais P. Hansen",
"email": "tais.hansen@gmail.com"
"name": "Jordan Gosney",
"email": "wizofgoz2@gmail.com"
}
],
"require": {
"php": ">=5.6",
"php": ">=7.3",
"guzzlehttp/guzzle": "^6.2",
"illuminate/support": "^5.4.36",
"jonahgeorge/jaeger-client-php": "dev-feature/php56",
"opentracing/opentracing": "^1.0.0-beta5",
"paragonie/random_compat": "^2",
"illuminate/support": "^7.0",
"jonahgeorge/jaeger-client-php": "^0.6.0",
"opentracing/opentracing": "^1.0.0-beta6",
"psr/cache": "~1.0.1"
},
"require-dev": {
"mockery/mockery": "^1.2.2",
"php-coveralls/php-coveralls": "^2.1",
"phpunit/phpunit": "~5.7.27"
"orchestra/testbench": "^5.0",
"php-coveralls/php-coveralls": "^2.2",
"phpunit/phpunit": "^9.0"
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/taisph/jaeger-client-php"
}
],
"autoload": {
"psr-4": {
"LaravelOpenTracing\\": "src/"
Expand Down

0 comments on commit 261e619

Please sign in to comment.