Skip to content

Commit cad4e58

Browse files
committed
Resolve conflicts
1 parent ed3f20c commit cad4e58

3 files changed

Lines changed: 2 additions & 24 deletions

File tree

.github/workflows/laravel.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,28 +37,6 @@ jobs:
3737
with:
3838
php-version: '8.2'
3939
- uses: actions/checkout@v3
40-
- name: Install Dependencies
41-
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
42-
- name: Create Database
43-
run: |
44-
mkdir -p database
45-
touch database/database.sqlite
46-
- name: Execute tests (Unit and Feature tests) via PHPUnit
47-
env:
48-
DB_CONNECTION: testing
49-
DB_DATABASE: database/database.sqlite
50-
run: vendor/bin/phpunit
51-
52-
53-
tests81:
54-
55-
runs-on: ubuntu-latest
56-
57-
steps:
58-
- uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
59-
with:
60-
php-version: '8.1'
61-
- uses: actions/checkout@v3
6240
- name: Install Dependencies
6341
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
6442
- name: Create Database

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "kdabrow/validation-codes",
3-
"description": "Validation codes",
3+
"description": "Validation codes for API",
44
"type": "package",
55
"keywords": [
66
"php",

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
php:
3-
image: webdevops/php-dev:8.1
3+
image: webdevops/php-dev:8.2
44
volumes:
55
- ./:/app/
66
working_dir: /app

0 commit comments

Comments
 (0)