DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Small mods to configs, removed old faker, added new

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2021-12-01 13:46:21 -08:00
parent bc355e1f26
commit d96e95abd6
5 changed files with 35 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
.env.testing-ci
View file

@ -1,10 +1,10 @@
# -------------------------------------------- # --------------------------------------------
# REQUIRED: BASIC APP SETTINGS # REQUIRED: BASIC APP SETTINGS
# -------------------------------------------- # --------------------------------------------
APP_ENV=testing-ci APP_ENV='testing-ci'
APP_DEBUG=false APP_DEBUG=false
APP_KEY=ChangeMe APP_KEY='base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU='
APP_URL=http://localhost:8000 APP_URL='http://localhost:8000'
APP_TIMEZONE='US/Pacific' APP_TIMEZONE='US/Pacific'
APP_LOCALE=en APP_LOCALE=en
FILESYSTEM_DISK=local FILESYSTEM_DISK=local
@ -14,7 +14,7 @@ FILESYSTEM_DISK=local
# -------------------------------------------- # --------------------------------------------
DB_CONNECTION=sqlite DB_CONNECTION=sqlite
DB_HOST=localhost DB_HOST=localhost
DB_DATABASE=sqlite_testing DB_DATABASE='sqlite_testing'
DB_USERNAME=root DB_USERNAME=root
DB_PASSWORD=null DB_PASSWORD=null
@ -22,13 +22,7 @@ DB_PASSWORD=null
# REQUIRED: OUTGOING MAIL SERVER SETTINGS # REQUIRED: OUTGOING MAIL SERVER SETTINGS
# -------------------------------------------- # --------------------------------------------
MAIL_DRIVER=log MAIL_DRIVER=log
MAIL_HOST=email-smtp.us-west-2.amazonaws.com
MAIL_PORT=587
MAIL_USERNAME=YOURUSERNAME
MAIL_PASSWORD=YOURPASSWORD
MAIL_ENCRYPTION=null
MAIL_FROM_ADDR=you@example.com
MAIL_FROM_NAME=Snipe-IT
# -------------------------------------------- # --------------------------------------------
# REQUIRED: IMAGE LIBRARY # REQUIRED: IMAGE LIBRARY
@ -37,36 +31,6 @@ MAIL_FROM_NAME=Snipe-IT
IMAGE_LIB=gd IMAGE_LIB=gd
# --------------------------------------------
# OPTIONAL: AWS S3 SETTINGS
# --------------------------------------------
AWS_SECRET_ACCESS_KEY=null
AWS_ACCESS_KEY_ID=null
AWS_DEFAULT_REGION=null
AWS_BUCKET=null
AWS_BUCKET_ROOT=null
AWS_URL=null
# --------------------------------------------
# OPTIONAL: CACHE SETTINGS
# --------------------------------------------
CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=sync
# --------------------------------------------
# OPTIONAL: SESSION SETTINGS
# --------------------------------------------
SESSION_LIFETIME=12000
EXPIRE_ON_CLOSE=false
ENCRYPT=false
COOKIE_NAME=snipeittest_session
COOKIE_DOMAIN=null
SECURE_COOKIES=false
# -------------------------------------------- # --------------------------------------------
# OPTIONAL: APP LOG FORMAT # OPTIONAL: APP LOG FORMAT
# -------------------------------------------- # --------------------------------------------

2
composer.json
View file

@ -66,7 +66,7 @@
"watson/validating": "^6.1" "watson/validating": "^6.1"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "master@dev", "fakerphp/faker": "^1.16",
"laravel/dusk": "^6.19", "laravel/dusk": "^6.19",
"overtrue/phplint": "^3.0", "overtrue/phplint": "^3.0",
"phpunit/php-token-stream": "^3.1", "phpunit/php-token-stream": "^3.1",

45
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "460e2030b6cbd082b792b79efc092dad", "content-hash": "bb88b46a71a93b8e4c8999fd440cb076",
"packages": [ "packages": [
{ {
"name": "adldap2/adldap2", "name": "adldap2/adldap2",
@ -11248,32 +11248,42 @@
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "fzaninotto/faker", "name": "fakerphp/faker",
"version": "dev-master", "version": "v1.16.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fzaninotto/Faker.git", "url": "https://github.com/FakerPHP/Faker.git",
"reference": "5ffe7db6c80f441f150fc88008d64e64af66634b" "reference": "271d384d216e5e5c468a6b28feedf95d49f83b35"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/5ffe7db6c80f441f150fc88008d64e64af66634b", "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/271d384d216e5e5c468a6b28feedf95d49f83b35",
"reference": "5ffe7db6c80f441f150fc88008d64e64af66634b", "reference": "271d384d216e5e5c468a6b28feedf95d49f83b35",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3.3 || ^7.0 || ^8.0" "php": "^7.1 || ^8.0",
"psr/container": "^1.0 || ^2.0",
"symfony/deprecation-contracts": "^2.2"
},
"conflict": {
"fzaninotto/faker": "*"
}, },
"require-dev": { "require-dev": {
"bamarni/composer-bin-plugin": "^1.4.1",
"ext-intl": "*", "ext-intl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7", "symfony/phpunit-bridge": "^4.4 || ^5.2"
"squizlabs/php_codesniffer": "^2.9.2" },
"suggest": {
"ext-curl": "Required by Faker\\Provider\\Image to download images.",
"ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.",
"ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.",
"ext-mbstring": "Required for multibyte Unicode string functionality."
}, },
"default-branch": true,
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.9-dev" "dev-main": "v1.16-dev"
} }
}, },
"autoload": { "autoload": {
@ -11297,11 +11307,10 @@
"fixtures" "fixtures"
], ],
"support": { "support": {
"issues": "https://github.com/fzaninotto/Faker/issues", "issues": "https://github.com/FakerPHP/Faker/issues",
"source": "https://github.com/fzaninotto/Faker/tree/master" "source": "https://github.com/FakerPHP/Faker/tree/v1.16.0"
}, },
"abandoned": true, "time": "2021-09-06T14:53:37+00:00"
"time": "2020-12-11T09:59:14+00:00"
}, },
{ {
"name": "laravel/dusk", "name": "laravel/dusk",
@ -12827,9 +12836,7 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": [],
"fzaninotto/faker": 20
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {

2
database/factories/UserFactory.php
View file

@ -4,7 +4,7 @@ namespace Database\Factories;
use App\Models\Company; use App\Models\Company;
use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Facades\Hash;
class UserFactory extends Factory class UserFactory extends Factory

2
phpunit.xml
View file

@ -23,7 +23,7 @@
<env name="CACHE_DRIVER" value="array"/> <env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/> <env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/> <env name="QUEUE_DRIVER" value="sync"/>
<env name="DB_CONNECTION" value="sqlite_testing" /> <env name="DB_CONNECTION" value="sqlite" />
<server name="SERVER_NAME" value="http://127.0.0.1:8000"/> <server name="SERVER_NAME" value="http://127.0.0.1:8000"/>
<ini name="display_errors" value="true"/> <ini name="display_errors" value="true"/>
</php> </php>