Skip to content

Commit

Permalink
Merge pull request #1 from VictoRD11/upgradeVersionLaravel
Browse files Browse the repository at this point in the history
Upgrade dependencies and description
  • Loading branch information
VictoRD11 authored Feb 16, 2021
2 parents c15d42c + ea3b296 commit 2ce8314
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 7 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Testing package

on: [push, pull_request]

jobs:
run:

runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: [ubuntu-latest, macOS-latest]
php-versions: ['7.2', '7.3', '7.4']
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}

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

- name: Setup PHP
uses: shivammathur/setup-php@v1
with:
php-version: ${{ matrix.php-versions }}
extensions: mbstring

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v1
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

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

- name: Run style-checking
run: composer run-script check-style
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
> composer require victord11/transliterate
```

> ⚠️ Для Laravel v5 используйте ветку v2: `composer require victord11/transliterate "^2.0"`
Laravel начиная с версии *5.5* не нуждается в дополнительной конфигурации благодаря механизму Package Discovery.

Если вы не используте Package Discovery, необходимо зарегистрировать `Service Provider`, добавив его в массив `providers`, конфигурационного файла `app.php`.
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "victord11/transliterate",
"description": "Transliteration package for laravel 5",
"version": "3.0.0",
"version": "4.0.0",
"type": "library",
"license": "MIT",
"authors": [
Expand All @@ -25,14 +25,14 @@
}
},
"require": {
"php": ">=7.1",
"illuminate/support": "~5"
"php": ">=7.2",
"illuminate/support": "~6"
},
"require-dev": {
"phpunit/phpunit": "^7.4",
"orchestra/testbench": "^3.7",
"friendsofphp/php-cs-fixer": "^2.13",
"brainmaestro/composer-git-hooks": "^2.6"
"phpunit/phpunit": "^8.0",
"orchestra/testbench": "^4.4",
"friendsofphp/php-cs-fixer": "^2.16",
"brainmaestro/composer-git-hooks": "^2.8"
},
"extra": {
"laravel": {
Expand Down

0 comments on commit 2ce8314

Please sign in to comment.