Skip to content

Commit

Permalink
Update php (#41)
Browse files Browse the repository at this point in the history
* Updated php version

* Updated composer dependencies

* Updated workflow
  • Loading branch information
thiagocordeiro authored Mar 3, 2021
1 parent 67131f1 commit e05b942
Show file tree
Hide file tree
Showing 18 changed files with 2,270 additions and 2,332 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ name: Integration Test
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
integration:

runs-on: ubuntu-latest

steps:
Expand All @@ -18,7 +15,7 @@ jobs:
run: composer create-project --prefer-dist laravel/laravel blog

- name: Require translator package
run: composer require thiagocordeiro/laravel-translator:dev-master#$GITHUB_SHA -d blog/
run: composer require thiagocordeiro/laravel-translator:dev-master -d blog/

- name: Copy Fixtures 1
run: cp -R tests/Fixtures/App/Functions blog/app
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Tests
name: Unit Tests

on:
push:
Expand All @@ -8,7 +8,6 @@ on:

jobs:
tests:

runs-on: ubuntu-latest

steps:
Expand All @@ -31,7 +30,7 @@ jobs:
run: composer install --prefer-dist --no-progress --no-suggest

- name: Check code standards
run: composer run cs:check
run: composer run test:cs

- name: Check static analysis
run: composer run test:stan
Expand Down
21 changes: 7 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,22 @@
"email": "[email protected]"
}
],
"config": {
"platform": {
"php": "7.2.0"
}
},
"require": {
"php": "^7.2",
"php": "^7.4|^8.0",
"ext-json": "*",
"laravel/framework": ">=5.4.0"
},
"require-dev": {
"composer/composer": "^1.8",
"squizlabs/php_codesniffer": "^3.4",
"slevomat/coding-standard": "^5.0",
"phpstan/phpstan": "^0.11.8",
"phpunit/phpunit": "^8.0"
"slevomat/coding-standard": "^6.0",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^9.0"
},
"scripts": {
"cs:check": "vendor/bin/phpcs --colors -ps",
"test:cs": "vendor/bin/phpcs --colors -ps",
"test:stan": "vendor/bin/phpstan analyse src --level=max --ansi",
"test:unit": "vendor/bin/phpunit --testdox --color=always",
"tests": [
"@cs:check",
"@test:cs",
"@test:stan",
"@test:unit"
]
Expand All @@ -46,7 +39,7 @@
},
"autoload-dev": {
"psr-4": {
"Tests\\Unit\\Translator\\": "tests/Unit"
"Translator\\Tests\\": "tests"
}
},
"extra": {
Expand Down
Loading

0 comments on commit e05b942

Please sign in to comment.