Skip to content

Commit

Permalink
Merge branch 'feature/support-for-laravel-8'
Browse files Browse the repository at this point in the history
  • Loading branch information
ElForastero committed Feb 24, 2021
2 parents 49e651d + 93e165d commit 28fa126
Show file tree
Hide file tree
Showing 11 changed files with 3,240 additions and 1,179 deletions.
19 changes: 7 additions & 12 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest, macOS-latest]
php-versions: ['7.2', '7.3', '7.4']
php-versions: ['7.3', '7.4', '8.0']
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v1
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: mbstring, intl
Expand All @@ -26,23 +26,18 @@ jobs:
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v1
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ${{ steps.composer-cache.outputs.dir }}
# Use composer.json for key, if composer.lock is not committed.
# key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Validate composer.json and composer.lock
run: composer validate

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

- name: Run test suite
run: composer run-script test

- name: Run style-checking
run: composer run-script check-style
22 changes: 18 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
## Release notes

## [v2.0.0](https://github.com/elforastero/transliterate/releases/tag/2.0.0)
## [v5.0.0](https://github.com/elforastero/transliterate/releases/tag/v5.0.0)
- Support for Laravel 8
- Drop support of php7.2
- Require phpunit >= 9

## Added
## [v4.0.0](https://github.com/elforastero/transliterate/releases/tag/v4.0.0)
- Support for Laravel 7

## [v3.0.0](https://github.com/elforastero/transliterate/releases/tag/v3.0.0)
- Support for Laravel 6
- Upgrade dependencies
- Update description
- Bump a major version to be able to use v2 branch with Laravel 5

## [v2.0.0](https://github.com/elforastero/transliterate/releases/tag/v2.0.0)

### Added
- Added Package Discovery support
- Added configuration file transliterate.php
- Added ability to define custom transliteration maps
- Added ability to define transformers
- Added optional removing accents using ICU
- Added tests

## Removed
### Removed
- Removed all default text transformations
- Removed config option from Transliteration::make
- Removed config option from Transliteration::make
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "elforastero/transliterate",
"description": "Transliteration package for laravel",
"version": "4.0.0",
"version": "5.0.0",
"type": "library",
"license": "MIT",
"authors": [
Expand All @@ -21,14 +21,14 @@
}
},
"require": {
"php": ">=7.2",
"php": ">=7.3",
"ext-intl": "*",
"illuminate/support": "^6.0|^7.0"
"illuminate/support": "^6.0|^7.0|^8.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0",
"orchestra/testbench": "^4.4",
"friendsofphp/php-cs-fixer": "^2.16",
"phpunit/phpunit": ">=9.0",
"orchestra/testbench": ">=6.0",
"friendsofphp/php-cs-fixer": "^2.18",
"brainmaestro/composer-git-hooks": "^2.8"
},
"extra": {
Expand Down
Loading

0 comments on commit 28fa126

Please sign in to comment.