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

Commit

Permalink
4.4.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
lcharette committed Dec 28, 2020
2 parents 6c32988 + b83f9d0 commit 67c536b
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 32 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 @@ -6,3 +6,4 @@ composer.lock
_meta
.serenata
.vscode
.phpunit.result.cache
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

5 changes: 5 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.3]
- Replaced Travis with GitHub Action for build
- Upgrade deprecation in tests

## [4.4.2]
- Fixed issue where locale files from higher priority locations would not overwrite files from lower priority locations. (N.B.: This fix means the files withing the same locations will be loaded in BACKWARD order. Having the location order is more important in this case.)

Expand Down Expand Up @@ -64,6 +68,7 @@ See updated [documentation](README.md) for more details on how to use the new Tr
## 4.0.0
- Initial release

[4.4.3]: https://github.com/userfrosting/i18n/compare/4.4.2...4.4.3
[4.4.2]: https://github.com/userfrosting/i18n/compare/4.4.1...4.4.2
[4.4.1]: https://github.com/userfrosting/i18n/compare/4.4.0...4.4.1
[4.4.0]: https://github.com/userfrosting/i18n/compare/4.3.0...4.4.0
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Latest Version](https://img.shields.io/github/release/userfrosting/i18n.svg)](https://github.com/userfrosting/i18n/releases)
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md)
[![Join the chat at https://chat.userfrosting.com/channel/support](https://demo.rocket.chat/images/join-chat.svg)](https://chat.userfrosting.com/channel/support)
[![Join the chat at https://chat.userfrosting.com/channel/support](https://chat.userfrosting.com/api/v1/shield.svg?name=UserFrosting)](https://chat.userfrosting.com/channel/support)
[![Donate](https://img.shields.io/badge/Open%20Collective-Donate-blue.svg)](https://opencollective.com/userfrosting#backer)

| Branch | Build | Coverage | Style |
Expand All @@ -14,12 +14,12 @@
[i18n]: https://github.com/userfrosting/i18n
[i18n-develop]: https://github.com/userfrosting/i18n/tree/develop
[i18n-version]: https://img.shields.io/github/release/userfrosting/i18n.svg
[i18n-master-build]: https://travis-ci.org/userfrosting/i18n.svg?branch=master
[i18n-master-build]: https://github.com/userfrosting/i18n/workflows/Build/badge.svg?branch=master
[i18n-master-codecov]: https://codecov.io/gh/userfrosting/i18n/branch/master/graph/badge.svg
[i18n-develop-build]: https://travis-ci.org/userfrosting/i18n.svg?branch=develop
[i18n-develop-build]: https://github.com/userfrosting/i18n/workflows/Build/badge.svg?branch=develop
[i18n-develop-codecov]: https://codecov.io/gh/userfrosting/i18n/branch/develop/graph/badge.svg
[i18n-releases]: https://github.com/userfrosting/i18n/releases
[i18n-travis]: https://travis-ci.org/userfrosting/i18n
[i18n-travis]: https://github.com/userfrosting/i18n/actions?query=workflow%3ABuild
[i18n-codecov]: https://codecov.io/gh/userfrosting/i18n
[i18n-style-master]: https://github.styleci.io/repos/60137335/shield?branch=master&style=flat
[i18n-style-develop]: https://github.styleci.io/repos/60137335/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 @@ -23,7 +23,7 @@
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.13",
"mockery/mockery": "^1.2",
"phpunit/phpunit": "^7.5",
"phpunit/phpunit": "^7.5 | ^8.5",
"victorjonsson/markdowndocs": "^1.3"
},
"autoload": {
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>
4 changes: 2 additions & 2 deletions tests/CompareTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class CompareTest extends TestCase
/**
* {@inheritdoc}
*/
public function setup()
public function setup(): void
{
parent::setup();

Expand Down Expand Up @@ -61,7 +61,7 @@ public function setup()
/**
* {@inheritdoc}
*/
public function tearDown()
public function tearDown(): void
{
Mockery::close();
}
Expand Down
4 changes: 2 additions & 2 deletions tests/DictionaryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ class DictionaryTest extends TestCase

protected $locator;

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

$this->locator->registerStream('locale', '', null, true);
}

public function tearDown()
public function tearDown(): void
{
Mockery::close();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/LocaleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class LocaleTest extends TestCase
/** @var ResourceLocator */
protected $locator;

public function setUp()
public function setUp(): void
{
$this->basePath = __DIR__.'/data/sprinkles';
$this->locator = new ResourceLocator($this->basePath);
Expand Down
2 changes: 1 addition & 1 deletion tests/TranslatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class TranslatorTest extends TestCase
/** @var ResourceLocator */
protected $locator;

public function setUp()
public function setUp(): void
{
$this->locator = new ResourceLocator($this->basePath);

Expand Down

0 comments on commit 67c536b

Please sign in to comment.