Skip to content

Commit

Permalink
Merge pull request #49 from flagship-io/feature/tracking_manager
Browse files Browse the repository at this point in the history
Feature/tracking manager
  • Loading branch information
Heihokon committed Mar 7, 2023
2 parents 9069fbe + 3f3d0d4 commit a849960
Show file tree
Hide file tree
Showing 129 changed files with 7,757 additions and 2,341 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ dockers
.idea
vendor
reports
composer.lock
example/vendor
example/reports
example/storage/logs/*
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/CI_PHP_5_4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,13 @@ jobs:
coverage: xdebug
tools: phpunit:${{ matrix.phpunit-versions }}

- name: Install dependencies
run: composer install --prefer-dist --no-progress
- run: rm composer.lock

- run: composer remove phpunit/phpunit --dev --no-update
- run: composer remove psr/log --no-update

- name: Run test suite
run: composer run-script test
- name: Install dependencies
run: composer install --prefer-dist --no-progress

- name: Generate test coverage badge
uses: timkrase/phpunit-coverage-badge@v1.2.0
with:
coverage_badge_path: 'badge_php_5_4.svg'
push_badge: true
repo_token: ${{ secrets.GITHUB_TOKEN }}
- run: composer require phpunit/phpunit --dev -W
- run: composer require psr/log:^1 -W
10 changes: 7 additions & 3 deletions .github/workflows/CI_PHP_5_6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ jobs:
coverage: xdebug
tools: phpunit:${{ matrix.phpunit-versions }}

- run: rm composer.lock

- run: composer remove phpunit/phpunit --dev --no-update
- run: composer remove psr/log --no-update

- name: Install dependencies
run: composer install --prefer-dist --no-progress


- name: Run test suite
run: composer run-script test
- run: composer require phpunit/phpunit --dev -W
- run: composer require psr/log:^1 -W

9 changes: 8 additions & 1 deletion .github/workflows/CI_PHP_7.4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
php-versions: ['7.3']
php-versions: ['7.4']
phpunit-versions: ['5.7']

steps:
Expand All @@ -40,9 +40,16 @@ jobs:
coverage: xdebug
tools: phpunit:${{ matrix.phpunit-versions }}

- run: rm composer.lock

- run: composer remove phpunit/phpunit --dev --no-update
- run: composer remove psr/log --no-update

- name: Install dependencies
run: composer install --prefer-dist --no-progress

- run: composer require phpunit/phpunit:5.7 --dev -W
- run: composer require psr/log:^1 -W

- name: Run test suite
run: composer run-script test
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/CI_PHP_8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ jobs:
- name: Remove current phpunit version
run: composer remove phpunit/phpunit --dev

- name: install new phpunit version
run: composer require phpunit/phpunit --dev

- name: Install dependencies
run: composer install --prefer-dist --no-progress

- name: install new phpunit version
run: composer require phpunit/phpunit:9.6 --dev

- name: Run test suite
run: composer run-script test -- -c phpunit.8.xml

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ reports
bucketing.json
flagship
/src/Api/HIT_LOG
/.phpunit.cache
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"license": "Apache-2.0",
"require": {
"php": ">=5.4",
"psr/log": "^1.1",
"ext-curl": "*",
"ext-json": "*"
"ext-json": "*",
"psr/log": "^1|^2|^3"
},
"require-dev": {
"squizlabs/php_codesniffer": "^3.6",
"phpunit/phpunit": "^4.8"
"phpunit/phpunit": "9.6"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit a849960

Please sign in to comment.