Skip to content

Commit

Permalink
Merge pull request #114 from ihamzehald/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ihamzehald authored Sep 19, 2020
2 parents 96077a1 + 8d26794 commit acccac4
Show file tree
Hide file tree
Showing 8 changed files with 1,673 additions and 2,022 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/php:7.2.8-node-browsers
- image: circleci/php:7.3-node-browsers

steps:
- checkout
Expand Down
37 changes: 18 additions & 19 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,27 @@
],
"license": "MIT",
"require": {
"php": "^7.2.5",
"php": "^7.3",
"codeception/codeception": "^4.1",
"darkaonline/l5-swagger": "7.*",
"codeception/module-asserts": "^1.0.0",
"codeception/module-phpbrowser": "^1.0.0",
"darkaonline/l5-swagger": "8.*",
"doctrine/dbal": "^2.10",
"fideloper/proxy": "^4.2",
"fruitcake/laravel-cors": "^1.0",
"guzzlehttp/guzzle": "^6.3",
"laravel/framework": "^7.0",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.0",
"laravel/legacy-factories": "^1.0",
"laravel/tinker": "^2.0",
"laravel/ui": "2.0",
"phpunit/phpunit": "^8.5",
"tymon/jwt-auth": "dev-develop",
"codeception/module-phpbrowser": "^1.0.0",
"codeception/module-asserts": "^1.0.0"
"laravel/ui": "^3.0",
"phpunit/phpunit": "^9.0",
"tymon/jwt-auth": "dev-develop"
},
"require-dev": {
"facade/ignition": "^2.0",
"facade/ignition": "^2.3.6",
"fzaninotto/faker": "^1.9.1",
"mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^4.1",
"nunomaduro/collision": "^5.0",
"squizlabs/php_codesniffer": "^3.5"
},
"config": {
Expand All @@ -42,12 +43,10 @@
},
"autoload": {
"psr-4": {
"App\\": "app/"
},
"classmap": [
"database/seeds",
"database/factories"
]
"App\\": "app/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/"
}
},
"autoload-dev": {
"psr-4": {
Expand All @@ -68,4 +67,4 @@
"@php artisan key:generate --ansi"
]
}
}
}
Loading

0 comments on commit acccac4

Please sign in to comment.