Skip to content
This repository has been archived by the owner on Apr 28, 2024. It is now read-only.

Commit

Permalink
4.4.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
lcharette authored Dec 28, 2020
2 parents 81d6e80 + a5348ed commit 7c4843c
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 26 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Build

on:
push:
branches: [master, develop]
pull_request:
branches: [master, develop]
schedule:
- cron: "0 0 * * 5"

jobs:
PHPUnit:

strategy:
fail-fast: false
matrix:
php_versions: ['7.1', '7.2', '7.3', '7.4']

name: PHPUnit Tests - ${{ matrix.php_versions }}
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php_versions }}
extensions: mbstring, dom, fileinfo, gd
coverage: xdebug
tools: pecl
- name: Install Dependencies
run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
- name: Execute tests via PHPUnit
run: vendor/bin/phpunit
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
file: ./_meta/coverage.xml
fail_ci_if_error: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ composer.lock
*.komodoproject
.php_cs.cache
_meta
.phpunit.result.cache

tests/DotenvEditor/data/.env-backups/*
!tests/DotenvEditor/data/.env-backups/.gitkeep
19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [4.4.1]
- Replaced Travis with GitHub Action for build
- Fix deprecation in tests

## [4.4.0]
- Update dependencies

Expand Down Expand Up @@ -53,7 +57,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
## 4.0.0
- Initial Release

[4.4.1]: https://github.com/userfrosting/support/compare/4.4.0...4.4.1
[4.4.0]: https://github.com/userfrosting/support/compare/4.3.3...4.4.0
[4.3.4]: https://github.com/userfrosting/support/compare/4.3.3...4.3.4
[4.3.3]: https://github.com/userfrosting/support/compare/4.3.2...4.3.3
[4.3.2]: https://github.com/userfrosting/support/compare/4.3.1...4.3.2
[4.3.1]: https://github.com/userfrosting/support/compare/4.3.0...4.3.1
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
[Support]: https://github.com/userfrosting/support
[support-develop]: https://github.com/userfrosting/support/tree/develop
[support-version]: https://img.shields.io/github/release/userfrosting/support.svg
[support-master-build]: https://travis-ci.org/userfrosting/support.svg?branch=master
[support-master-build]: https://github.com/userfrosting/support/workflows/Build/badge.svg?branch=master
[support-master-codecov]: https://codecov.io/gh/userfrosting/support/branch/master/graph/badge.svg
[support-develop-build]: https://travis-ci.org/userfrosting/support.svg?branch=develop
[support-develop-build]: https://github.com/userfrosting/support/workflows/Build/badge.svg?branch=develop
[support-develop-codecov]: https://codecov.io/gh/userfrosting/support/branch/develop/graph/badge.svg
[support-releases]: https://github.com/userfrosting/support/releases
[support-travis]: https://travis-ci.org/userfrosting/support
[support-travis]: https://github.com/userfrosting/support/actions
[support-codecov]: https://codecov.io/gh/userfrosting/support
[support-style-master]: https://github.styleci.io/repos/60137523/shield?branch=master&style=flat
[support-style-develop]: https://github.styleci.io/repos/60137523/shield?branch=develop&style=flat
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.13",
"phpunit/phpunit": "^7.5"
"phpunit/phpunit": "^7.5 | ^8.5"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 4 additions & 0 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@
<directory suffix=".php">src/</directory>
</whitelist>
</filter>
<logging>
<log type="coverage-html" target="_meta/coverage"/>
<log type="coverage-clover" target="_meta/coverage.xml"/>
</logging>
</phpunit>
3 changes: 2 additions & 1 deletion tests/DotenvEditor/DotenvEditorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

namespace UserFrosting\Support\Tests\DotenvEditor;

use Jackiedo\DotenvEditor\Exceptions\FileNotFoundException;
use PHPUnit\Framework\TestCase;
use UserFrosting\Support\DotenvEditor\DotenvEditor;

Expand All @@ -27,10 +28,10 @@ public function testConstructor()

/**
* @depends testConstructor
* @expectedException \Jackiedo\DotenvEditor\Exceptions\FileNotFoundException
*/
public function testBackupException()
{
$this->expectException(FileNotFoundException::class);
new DotenvEditor($this->basePath.'backups/');
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Repository/PathBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class PathBuilderTest extends TestCase

protected $locator;

public function setUp()
public function setUp(): void
{
$this->basePath = __DIR__.'/data';
$this->locator = new ResourceLocator($this->basePath);
Expand Down
2 changes: 1 addition & 1 deletion tests/Repository/RepositoryLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class RepositoryLoaderTest extends TestCase
'chicks' => 4,
];

public function setUp()
public function setUp(): void
{
$this->basePath = __DIR__.'/data';
$this->locator = new ResourceLocator($this->basePath);
Expand Down

0 comments on commit 7c4843c

Please sign in to comment.