Skip to content

Commit

Permalink
Merge pull request #80 from bushbaby/fly-v3
Browse files Browse the repository at this point in the history
Fly v3
  • Loading branch information
basz committed Jan 6, 2023
2 parents b8fccb3 + edf02cf commit f6e102b
Show file tree
Hide file tree
Showing 72 changed files with 2,325 additions and 3,005 deletions.
2 changes: 1 addition & 1 deletion .docheader
Expand Up @@ -5,7 +5,7 @@ file that was distributed with this source code.

@see https://bushbaby.nl/

@copyright Copyright (c) 2014-%year% bushbaby multimedia. (https://bushbaby.nl)
@copyright Copyright (c) 2014 bushbaby multimedia. (https://bushbaby.nl)
@author Bas Kamer <baskamer@gmail.com>
@license MIT

Expand Down
23 changes: 6 additions & 17 deletions .github/workflows/test.yml
Expand Up @@ -14,21 +14,10 @@ jobs:
runs-on: "ubuntu-latest"
strategy:
matrix:
dependencies:
- "--prefer-lowest"
- ""
php-version:
- "8.2"
- "8.1"
- "8.0"
- "7.4"
composer:
- "v2"
include:
- php-version: "7.3"
composer: "v1"
dependencies: "--prefer-lowest"
- php-version: "7.3"
composer: "v1"
dependencies: ""

steps:
- name: "Checkout"
Expand All @@ -37,9 +26,9 @@ jobs:
uses: "shivammathur/setup-php@v2"
with:
php-version: "${{ matrix.php-version }}"
tools: "composer:${{ matrix.composer }}"
ini-values: zend.assertions=1,assert.exception=1
- name: "Install dependencies"
run: "composer update ${{ matrix.dependencies }} --no-interaction"
run: "composer update --no-interaction"
- name: "Run tests"
run: "vendor/bin/phpunit"

Expand All @@ -54,11 +43,11 @@ jobs:
with:
php-version: "8.0"
tools: "composer:v2"
coverage: "pcov"
ini-values: zend.assertions=1,assert.exception=1
- name: "Install dependencies"
run: "composer update --no-interaction"
- name: "Install coveralls"
run: "composer require --dev php-coveralls/php-coveralls"
run: "composer require --dev php-coveralls/php-coveralls:^2.0 --with-all-dependencies"
- name: "Generate coverage"
run: "vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml --configuration ./phpunit.xml.dist"
- name: "Publish coverage"
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
@@ -1,4 +1,4 @@
.php_cs.cache
.php-cs-fixer.cache
composer.lock
vendor
.phpunit.result.cache
6 changes: 1 addition & 5 deletions .php-cs-fixer.php
Expand Up @@ -8,7 +8,7 @@
*
* @see https://bushbaby.nl/
*
* @copyright Copyright (c) 2014-2021 bushbaby multimedia. (https://bushbaby.nl)
* @copyright Copyright (c) 2014 bushbaby multimedia. (https://bushbaby.nl)
* @author Bas Kamer <baskamer@gmail.com>
* @license MIT
*
Expand All @@ -23,8 +23,4 @@

$config->getFinder()->in(__DIR__)->append([__FILE__]);

$cacheDir = getenv('TRAVIS') ? getenv('HOME') . '/.php-cs-fixer' : __DIR__;

$config->setCacheFile($cacheDir . '/.php_cs.cache');

return $config;

0 comments on commit f6e102b

Please sign in to comment.