diff --git a/.env.testing-ci b/.env.testing-ci
index 83f4bcff90..af698f8400 100644
--- a/.env.testing-ci
+++ b/.env.testing-ci
@@ -1,10 +1,10 @@
# --------------------------------------------
# REQUIRED: BASIC APP SETTINGS
# --------------------------------------------
-APP_ENV=testing-ci
+APP_ENV='testing-ci'
APP_DEBUG=false
-APP_KEY=ChangeMe
-APP_URL=http://localhost:8000
+APP_KEY='base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU='
+APP_URL='http://localhost:8000'
APP_TIMEZONE='US/Pacific'
APP_LOCALE=en
FILESYSTEM_DISK=local
@@ -14,7 +14,7 @@ FILESYSTEM_DISK=local
# --------------------------------------------
DB_CONNECTION=sqlite
DB_HOST=localhost
-DB_DATABASE=sqlite_testing
+DB_DATABASE='sqlite_testing'
DB_USERNAME=root
DB_PASSWORD=null
@@ -22,13 +22,7 @@ DB_PASSWORD=null
# REQUIRED: OUTGOING MAIL SERVER SETTINGS
# --------------------------------------------
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
@@ -37,37 +31,7 @@ MAIL_FROM_NAME=Snipe-IT
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
# --------------------------------------------
-APP_LOG=single
+APP_LOG=single
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 1a23a21497..a04a66c9bd 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,7 @@
"watson/validating": "^6.1"
},
"require-dev": {
- "fzaninotto/faker": "master@dev",
+ "fakerphp/faker": "^1.16",
"laravel/dusk": "^6.19",
"overtrue/phplint": "^3.0",
"phpunit/php-token-stream": "^3.1",
diff --git a/composer.lock b/composer.lock
index f6a1eb1178..61eb061899 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "460e2030b6cbd082b792b79efc092dad",
+ "content-hash": "bb88b46a71a93b8e4c8999fd440cb076",
"packages": [
{
"name": "adldap2/adldap2",
@@ -11248,32 +11248,42 @@
],
"packages-dev": [
{
- "name": "fzaninotto/faker",
- "version": "dev-master",
+ "name": "fakerphp/faker",
+ "version": "v1.16.0",
"source": {
"type": "git",
- "url": "https://github.com/fzaninotto/Faker.git",
- "reference": "5ffe7db6c80f441f150fc88008d64e64af66634b"
+ "url": "https://github.com/FakerPHP/Faker.git",
+ "reference": "271d384d216e5e5c468a6b28feedf95d49f83b35"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/5ffe7db6c80f441f150fc88008d64e64af66634b",
- "reference": "5ffe7db6c80f441f150fc88008d64e64af66634b",
+ "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/271d384d216e5e5c468a6b28feedf95d49f83b35",
+ "reference": "271d384d216e5e5c468a6b28feedf95d49f83b35",
"shasum": ""
},
"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": {
+ "bamarni/composer-bin-plugin": "^1.4.1",
"ext-intl": "*",
- "phpunit/phpunit": "^4.8.35 || ^5.7",
- "squizlabs/php_codesniffer": "^2.9.2"
+ "symfony/phpunit-bridge": "^4.4 || ^5.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",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-main": "v1.16-dev"
}
},
"autoload": {
@@ -11297,11 +11307,10 @@
"fixtures"
],
"support": {
- "issues": "https://github.com/fzaninotto/Faker/issues",
- "source": "https://github.com/fzaninotto/Faker/tree/master"
+ "issues": "https://github.com/FakerPHP/Faker/issues",
+ "source": "https://github.com/FakerPHP/Faker/tree/v1.16.0"
},
- "abandoned": true,
- "time": "2020-12-11T09:59:14+00:00"
+ "time": "2021-09-06T14:53:37+00:00"
},
{
"name": "laravel/dusk",
@@ -12827,9 +12836,7 @@
],
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": {
- "fzaninotto/faker": 20
- },
+ "stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 0c11c485ab..6905dcf30e 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -4,7 +4,7 @@ namespace Database\Factories;
use App\Models\Company;
use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Facades\Hash;
+
class UserFactory extends Factory
diff --git a/phpunit.xml b/phpunit.xml
index 37553e587d..c7f2568274 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -23,7 +23,7 @@
-
+