From 2aa50859b325ea0d31a0ab1e64da1acd34b1c937 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:01:03 -0800 Subject: [PATCH 001/159] Bump Dusk version to fix broken macOS chrome driver link --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 07dbf20639..06d8563039 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,7 @@ }, "require-dev": { "fakerphp/faker": "^1.16", - "laravel/dusk": "^6.19", + "laravel/dusk": "^6.25", "mockery/mockery": "^1.4", "phpunit/php-token-stream": "^3.1", "phpunit/phpunit": "^9.0", diff --git a/composer.lock b/composer.lock index bf8cb1f758..7c8b7030ba 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": "0c1f3848f8c9ede2b5f1513e4feaa7d7", + "content-hash": "4fed0ab76a34ef85a44568e470abab48", "packages": [ { "name": "alek13/slack", @@ -11847,16 +11847,16 @@ }, { "name": "laravel/dusk", - "version": "v6.25.0", + "version": "v6.25.2", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "b4632b7493a187d31afc5c9ddec437c81b16421a" + "reference": "25a595ac3dc82089a91af10dd23b0d58fd3f6d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/b4632b7493a187d31afc5c9ddec437c81b16421a", - "reference": "b4632b7493a187d31afc5c9ddec437c81b16421a", + "url": "https://api.github.com/repos/laravel/dusk/zipball/25a595ac3dc82089a91af10dd23b0d58fd3f6d0b", + "reference": "25a595ac3dc82089a91af10dd23b0d58fd3f6d0b", "shasum": "" }, "require": { @@ -11914,9 +11914,9 @@ ], "support": { "issues": "https://github.com/laravel/dusk/issues", - "source": "https://github.com/laravel/dusk/tree/v6.25.0" + "source": "https://github.com/laravel/dusk/tree/v6.25.2" }, - "time": "2022-07-11T11:38:43+00:00" + "time": "2022-09-29T09:37:07+00:00" }, { "name": "mockery/mockery", From 581655f7562199c61267e15e8ba05f1b3fd32b52 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:02:11 -0800 Subject: [PATCH 002/159] Run database migrations for all Dusk tests --- tests/DuskTestCase.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php index ac750d9efc..e591a7c771 100644 --- a/tests/DuskTestCase.php +++ b/tests/DuskTestCase.php @@ -5,11 +5,13 @@ namespace Tests; use Facebook\WebDriver\Chrome\ChromeOptions; use Facebook\WebDriver\Remote\DesiredCapabilities; use Facebook\WebDriver\Remote\RemoteWebDriver; +use Illuminate\Foundation\Testing\DatabaseMigrations; use Laravel\Dusk\TestCase as BaseTestCase; abstract class DuskTestCase extends BaseTestCase { use CreatesApplication; + use DatabaseMigrations; /** * Prepare for Dusk test execution. From bc0f666906d81eaedc0d9273ed54fb1cc8a6e496 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:03:09 -0800 Subject: [PATCH 003/159] Create Setting in test to avoid being redirected to the setup screen --- tests/Browser/LoginTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Browser/LoginTest.php b/tests/Browser/LoginTest.php index 5ed055cda9..18f5172f15 100644 --- a/tests/Browser/LoginTest.php +++ b/tests/Browser/LoginTest.php @@ -2,8 +2,8 @@ namespace Tests\Browser; +use App\Models\Setting; use App\Models\User; -use Illuminate\Foundation\Testing\DatabaseMigrations; use Laravel\Dusk\Browser; use Tests\DuskTestCase; @@ -26,6 +26,9 @@ class LoginTest extends DuskTestCase $user->permissions = '{"superuser": 1}'; $user->save(); + + Setting::factory()->create(); + $this->browse(function (Browser $browser) { $browser->visitRoute('login') ->assertSee(trans('auth/general.login_prompt')); @@ -37,10 +40,7 @@ class LoginTest extends DuskTestCase ->type('password', 'password') ->press(trans('auth/general.login')) ->assertPathIs('/'); - $browser->screenshot('dashboard'); + $browser->screenshot('dashboard'); }); - - // Delete the user afterwards - $user->delete(); } } From b8b2543b0dca61c29e90eac45a44d6852b6d4491 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:04:21 -0800 Subject: [PATCH 004/159] Reference the correct table in migration down method --- .../migrations/2017_03_10_210807_add_fields_to_manufacturer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2017_03_10_210807_add_fields_to_manufacturer.php b/database/migrations/2017_03_10_210807_add_fields_to_manufacturer.php index 0d05a680c1..05af7c8316 100644 --- a/database/migrations/2017_03_10_210807_add_fields_to_manufacturer.php +++ b/database/migrations/2017_03_10_210807_add_fields_to_manufacturer.php @@ -28,7 +28,7 @@ class AddFieldsToManufacturer extends Migration */ public function down() { - Schema::table('settings', function ($table) { + Schema::table('manufacturers', function ($table) { $table->dropColumn('url'); $table->dropColumn('support_url'); $table->dropColumn('support_phone'); From e5cb68cc5ebc73fda5266b783440117550f72f6c Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:06:16 -0800 Subject: [PATCH 005/159] Move drop column command to correct migration --- .../2016_08_23_145619_add_show_in_nav_to_status_labels.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php b/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php index c4e1a18177..5ea26bf4c1 100644 --- a/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php +++ b/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php @@ -25,7 +25,7 @@ class AddShowInNavToStatusLabels extends Migration public function down() { Schema::table('status_labels', function (Blueprint $table) { - $table->dropColumn('show_in_nav', 'field_encrypted'); + $table->dropColumn('show_in_nav'); }); } } From 39ab545cf5b08d3a79d6d4a84d96874db11519ba Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:08:28 -0800 Subject: [PATCH 006/159] Update alter statement to use correct suffix for column This is brittle... --- database/migrations/2015_09_22_003413_migrate_mac_address.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2015_09_22_003413_migrate_mac_address.php b/database/migrations/2015_09_22_003413_migrate_mac_address.php index 516b5c2ec7..8167e28adf 100644 --- a/database/migrations/2015_09_22_003413_migrate_mac_address.php +++ b/database/migrations/2015_09_22_003413_migrate_mac_address.php @@ -55,6 +55,6 @@ class MigrateMacAddress extends Migration Schema::table('models', function (Blueprint $table) { $table->renameColumn('deprecated_mac_address', 'show_mac_address'); }); - DB::statement('ALTER TABLE assets CHANGE _snipeit_mac_address mac_address varchar(255)'); + DB::statement('ALTER TABLE assets CHANGE _snipeit_mac_address_1 mac_address varchar(255)'); } } From 4ee3cbf60e5b6f17ecae9e6fc2025795f26008bd Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:20:20 -0800 Subject: [PATCH 007/159] Comment out migration's down method to match its up method --- ...015_07_29_230054_add_thread_id_to_asset_logs_table.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php b/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php index eefc283e3f..f14dc078cc 100644 --- a/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php +++ b/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php @@ -105,10 +105,10 @@ */ public function down() { - Schema::table('asset_logs', function (Blueprint $table) { - $table->dropIndex('thread_id'); - $table->dropColumn('thread_id'); - }); + // Schema::table('asset_logs', function (Blueprint $table) { + // $table->dropIndex('thread_id'); + // $table->dropColumn('thread_id'); + // }); } /** From c5b09ed95584b01e649c670f9d8b8e2a8778e041 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:21:46 -0800 Subject: [PATCH 008/159] Fix column name typo --- .../migrations/2013_12_10_084038_add_eol_on_models_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2013_12_10_084038_add_eol_on_models_table.php b/database/migrations/2013_12_10_084038_add_eol_on_models_table.php index d8d222deec..97e7b266e6 100755 --- a/database/migrations/2013_12_10_084038_add_eol_on_models_table.php +++ b/database/migrations/2013_12_10_084038_add_eol_on_models_table.php @@ -24,7 +24,7 @@ class AddEolOnModelsTable extends Migration public function down() { Schema::table('models', function ($table) { - $table->dropColumn('old'); + $table->dropColumn('eol'); }); } } From 296c9a723d25ec46190273ec39426d489cbe25c3 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:22:29 -0800 Subject: [PATCH 009/159] Reverse column rename in migration's down method --- .../2013_11_25_104343_alter_warranty_column_on_assets.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php b/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php index be62374dce..d63a6ad9b4 100755 --- a/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php +++ b/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php @@ -23,6 +23,8 @@ class AlterWarrantyColumnOnAssets extends Migration */ public function down() { - // + Schema::table('assets', function ($table) { + $table->renameColumn('warranty_months', 'warrantee_months'); + }); } } From 03938d0f32fd6f1b6891d5aa75e83edc7f8eccc1 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:24:38 -0800 Subject: [PATCH 010/159] Conditionally drop table --- .../migrations/2013_11_25_013244_recreate_licenses_table.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/migrations/2013_11_25_013244_recreate_licenses_table.php b/database/migrations/2013_11_25_013244_recreate_licenses_table.php index fb18452794..a22349dcd6 100755 --- a/database/migrations/2013_11_25_013244_recreate_licenses_table.php +++ b/database/migrations/2013_11_25_013244_recreate_licenses_table.php @@ -37,7 +37,7 @@ class ReCreateLicensesTable extends Migration */ public function down() { - // - Schema::drop('licenses'); + // This was most likely handled in 2013_11_17_054359_drop_licenses_table.php + Schema::dropIfExists('licenses'); } } From aec64fa64ac2a7b59e953972af55c349de7864d7 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:25:25 -0800 Subject: [PATCH 011/159] Comment out migration's down method to match its up method --- .../migrations/2013_11_17_054526_add_physical_to_assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2013_11_17_054526_add_physical_to_assets.php b/database/migrations/2013_11_17_054526_add_physical_to_assets.php index 2ccc7c43dc..28d1117201 100755 --- a/database/migrations/2013_11_17_054526_add_physical_to_assets.php +++ b/database/migrations/2013_11_17_054526_add_physical_to_assets.php @@ -26,6 +26,6 @@ class AddPhysicalToAssets extends Migration */ public function down() { - $table->dropColumn('physical'); + // $table->dropColumn('physical'); } } From b5ea8b8a4fd17bc27ddffb05881a748fec4526b2 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 10 Jan 2023 17:29:38 -0800 Subject: [PATCH 012/159] Conditionally drop table --- ..._12_06_225929_migration_cartalyst_sentry_install_groups.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php b/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php index cd45847bc7..49242f2e30 100644 --- a/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php +++ b/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php @@ -44,6 +44,7 @@ class MigrationCartalystSentryInstallGroups extends Migration */ public function down() { - Schema::drop('permission_groups'); + // See 2014_11_04_231416_update_group_field_for_reporting.php and 2019_06_12_184327_rename_groups_table.php + Schema::dropIfExists('permission_groups'); } } From e8c2b84d24b7fcfbd0bcced9bee09e0e701b5bed Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 11 Jan 2023 12:51:15 -0800 Subject: [PATCH 013/159] Add example dusk environment file --- .env.dusk.example | 106 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 .env.dusk.example diff --git a/.env.dusk.example b/.env.dusk.example new file mode 100644 index 0000000000..074f6fc3d7 --- /dev/null +++ b/.env.dusk.example @@ -0,0 +1,106 @@ +# -------------------------------------------- +# REQUIRED: BASIC APP SETTINGS +# -------------------------------------------- +APP_ENV=local +APP_DEBUG=false +APP_KEY=base64:hTUIUh9CP6dQx+6EjSlfWTgbaMaaRvlpEwk45vp+xmk= +APP_URL=http://127.0.0.1:8000 +APP_TIMEZONE='US/Eastern' +APP_LOCALE=en +APP_LOCKED=false +MAX_RESULTS=200 + +# -------------------------------------------- +# REQUIRED: UPLOADED FILE STORAGE SETTINGS +# -------------------------------------------- +PRIVATE_FILESYSTEM_DISK=local +PUBLIC_FILESYSTEM_DISK=local_public + +# -------------------------------------------- +# REQUIRED: DATABASE SETTINGS +# -------------------------------------------- +DB_CONNECTION=mysql +DB_HOST=127.0.0.1 +DB_PORT=3306 +DB_DATABASE=null +DB_USERNAME=null +DB_PASSWORD=null +DB_PREFIX=null +#DB_DUMP_PATH= + +# -------------------------------------------- +# OPTIONAL: SSL DATABASE SETTINGS +# -------------------------------------------- +DB_SSL=false +DB_SSL_KEY_PATH=null +DB_SSL_CERT_PATH=null +DB_SSL_CA_PATH=null +DB_SSL_CIPHER=null + +# -------------------------------------------- +# REQUIRED: OUTGOING MAIL SERVER SETTINGS +# -------------------------------------------- +MAIL_DRIVER="log" + + +# -------------------------------------------- +# REQUIRED: IMAGE LIBRARY +# This should be gd or imagick +# -------------------------------------------- +IMAGE_LIB=gd + + +# -------------------------------------------- +# OPTIONAL: SESSION SETTINGS +# -------------------------------------------- +SESSION_LIFETIME=12000 +EXPIRE_ON_CLOSE=false +ENCRYPT=true +COOKIE_NAME=snipeit_v5_local +SECURE_COOKIES=true + +# -------------------------------------------- +# OPTIONAL: SECURITY HEADER SETTINGS +# -------------------------------------------- +REFERRER_POLICY=same-origin +ENABLE_CSP=true +CORS_ALLOWED_ORIGINS="*" + +# -------------------------------------------- +# OPTIONAL: CACHE SETTINGS +# -------------------------------------------- +CACHE_DRIVER=file +SESSION_DRIVER=file +QUEUE_DRIVER=sync + +# -------------------------------------------- +# OPTIONAL: LOGIN THROTTLING +# -------------------------------------------- +LOGIN_MAX_ATTEMPTS=50000 +LOGIN_LOCKOUT_DURATION=1000 +RESET_PASSWORD_LINK_EXPIRES=15 + +# -------------------------------------------- +# OPTIONAL: API +# -------------------------------------------- +API_MAX_REQUESTS_PER_HOUR=200 + +# -------------------------------------------- +# OPTIONAL: SAML SETTINGS +# -------------------------------------------- +DISABLE_NOSAML_LOCAL_LOGIN=true + + +# -------------------------------------------- +# OPTIONAL: MISC +# -------------------------------------------- +LOG_CHANNEL=single +LOG_LEVEL=debug +LOG_CHANNEL=stack +LOG_SLACK_WEBHOOK_URL=null +APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1 +ALLOW_IFRAMING=true +ENABLE_HSTS=false +WARN_DEBUG=false +APP_CIPHER=AES-256-CBC + From 9a3a796e176ad593619d8633b73db77fe1d81ed7 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 11 Jan 2023 12:57:05 -0800 Subject: [PATCH 014/159] Add dusk environment files to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 37e9d3f68c..cc67e5c40d 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .couscous .DS_Store .env +.env.dusk.* .idea /bin/ /bootstrap/compiled.php From 49383ddbe0fd3c6a37a5a22a7cfeaa67c0c49926 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 11 Jan 2023 12:58:57 -0800 Subject: [PATCH 015/159] Delete old dusk local configuration --- .env.dusk.local | 106 ------------------------------------------------ 1 file changed, 106 deletions(-) delete mode 100644 .env.dusk.local diff --git a/.env.dusk.local b/.env.dusk.local deleted file mode 100644 index 33343ffc51..0000000000 --- a/.env.dusk.local +++ /dev/null @@ -1,106 +0,0 @@ -# -------------------------------------------- -# REQUIRED: BASIC APP SETTINGS -# -------------------------------------------- -APP_ENV=local -APP_DEBUG=false -APP_KEY=base64:hTUIUh9CP6dQx+6EjSlfWTgbaMaaRvlpEwk45vp+xmk= -APP_URL=http://127.0.0.1:8000 -APP_TIMEZONE='US/Eastern' -APP_LOCALE=en -APP_LOCKED=false -MAX_RESULTS=200 - -# -------------------------------------------- -# REQUIRED: UPLOADED FILE STORAGE SETTINGS -# -------------------------------------------- -PRIVATE_FILESYSTEM_DISK=local -PUBLIC_FILESYSTEM_DISK=local_public - -# -------------------------------------------- -# REQUIRED: DATABASE SETTINGS -# -------------------------------------------- -DB_CONNECTION=mysql -DB_HOST=localhost -DB_PORT=3306 -DB_DATABASE=snipeit-local -DB_USERNAME=snipeit-local -DB_PASSWORD=snipeit-local -DB_PREFIX=null -DB_DUMP_PATH='/Applications/MAMP/Library/bin' - -# -------------------------------------------- -# OPTIONAL: SSL DATABASE SETTINGS -# -------------------------------------------- -DB_SSL=false -DB_SSL_KEY_PATH=null -DB_SSL_CERT_PATH=null -DB_SSL_CA_PATH=null -DB_SSL_CIPHER=null - -# -------------------------------------------- -# REQUIRED: OUTGOING MAIL SERVER SETTINGS -# -------------------------------------------- -MAIL_DRIVER="log" - - -# -------------------------------------------- -# REQUIRED: IMAGE LIBRARY -# This should be gd or imagick -# -------------------------------------------- -IMAGE_LIB=gd - - -# -------------------------------------------- -# OPTIONAL: SESSION SETTINGS -# -------------------------------------------- -SESSION_LIFETIME=12000 -EXPIRE_ON_CLOSE=false -ENCRYPT=true -COOKIE_NAME=snipeit_v5_local -SECURE_COOKIES=true - -# -------------------------------------------- -# OPTIONAL: SECURITY HEADER SETTINGS -# -------------------------------------------- -REFERRER_POLICY=same-origin -ENABLE_CSP=true -CORS_ALLOWED_ORIGINS="*" - -# -------------------------------------------- -# OPTIONAL: CACHE SETTINGS -# -------------------------------------------- -CACHE_DRIVER=file -SESSION_DRIVER=file -QUEUE_DRIVER=sync - -# -------------------------------------------- -# OPTIONAL: LOGIN THROTTLING -# -------------------------------------------- -LOGIN_MAX_ATTEMPTS=50000 -LOGIN_LOCKOUT_DURATION=1000 -RESET_PASSWORD_LINK_EXPIRES=15 - -# -------------------------------------------- -# OPTIONAL: API -# -------------------------------------------- -API_MAX_REQUESTS_PER_HOUR=200 - -# -------------------------------------------- -# OPTIONAL: SAML SETTINGS -# -------------------------------------------- -DISABLE_NOSAML_LOCAL_LOGIN=true - - -# -------------------------------------------- -# OPTIONAL: MISC -# -------------------------------------------- -LOG_CHANNEL=single -LOG_LEVEL=debug -LOG_CHANNEL=stack -LOG_SLACK_WEBHOOK_URL=null -APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1 -ALLOW_IFRAMING=true -ENABLE_HSTS=false -WARN_DEBUG=false -APP_CIPHER=AES-256-CBC - From bc80f672ee1f88e8d4bc66facee410f439bcdedd Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 11 Jan 2023 13:00:34 -0800 Subject: [PATCH 016/159] Keep the example dusk environment file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cc67e5c40d..078a7e4b8a 100755 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .DS_Store .env .env.dusk.* +!.env.dusk.example .idea /bin/ /bootstrap/compiled.php From 49f2573f36602370666808494d9d738cd96ee436 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 11 Jan 2023 13:51:01 -0800 Subject: [PATCH 017/159] Update testing readme --- TESTING.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/TESTING.md b/TESTING.md index 6624289758..f7034895a3 100644 --- a/TESTING.md +++ b/TESTING.md @@ -43,23 +43,25 @@ you want to run. ## Browser Tests -The browser tests use [Dusk](https://laravel.com/docs/8.x/dusk) to run them. -When troubleshooting any problems, make sure that your `.env` file is configured -correctly to run the existing application. +Browser tests are run via [Laravel Dusk](https://laravel.com/docs/8.x/dusk) and require Google Chrome to be installed. + +Before attempting to run Dusk tests copy the example environment file for Dusk and update the values to match your environment: + +`cp .env.dusk.example .env.dusk.local` +> `local` refers to the value of `APP_ENV` in your `.env` so if you have it set to `dev` then the file should be named `.env.dusk.dev`. ### Test Setup -Your application needs to be configued and up and running in order for the browser +Your application needs to be configured and up and running in order for the browser tests to actually run. When running the tests locally, you can start the application using the following command: `php artisan serve` - -To run the test suite use the following command from another terminal tab or window: +Now you are ready to run the test suite. Use the following command from another terminal tab or window: `php artisan dusk` -To run individual test files, you can pass the path to the test that you want to run. +To run individual test files, you can pass the path to the test that you want to run: `php artisan dusk tests/Browser/LoginTest.php` From 0dd7cc9967941a821fe9d45864ab0c6844c8be4d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 11 Jan 2023 13:54:28 -0800 Subject: [PATCH 018/159] Add note about installing ChromeDriver to testing readme --- TESTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TESTING.md b/TESTING.md index f7034895a3..a1706177a9 100644 --- a/TESTING.md +++ b/TESTING.md @@ -65,3 +65,9 @@ Now you are ready to run the test suite. Use the following command from another To run individual test files, you can pass the path to the test that you want to run: `php artisan dusk tests/Browser/LoginTest.php` + +If you get an error when attempting to run Dusk tests that says `Couldn't connect to server` run: + +`php artisan dusk:chrome-driver --detect` + +This command will install the specific ChromeDriver Dusk needs for your operating system and Chrome version. From 51da747809ff039d5d294f493f13cd726cd4fbc3 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 11 Jan 2023 18:05:07 -0800 Subject: [PATCH 019/159] Add note about database requirements when running Dusk tests --- TESTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TESTING.md b/TESTING.md index a1706177a9..8a430d498e 100644 --- a/TESTING.md +++ b/TESTING.md @@ -50,6 +50,8 @@ Before attempting to run Dusk tests copy the example environment file for Dusk a `cp .env.dusk.example .env.dusk.local` > `local` refers to the value of `APP_ENV` in your `.env` so if you have it set to `dev` then the file should be named `.env.dusk.dev`. +**Important**: Dusk tests cannot be run using an in-memory SQLite database. Additionally, the Dusk test suite uses the `DatabaseMigrations` trait which will leave the database in a fresh state after running. Therefore, it is recommended that you create a test database and point `DB_DATABASE` in `.env.dusk.local` to it. + ### Test Setup Your application needs to be configured and up and running in order for the browser From fd73bee8505b766d102cb2003ae6bb6e0437dc92 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 21 Jan 2023 14:38:05 -0800 Subject: [PATCH 020/159] Fixed hardcoded string and added new checkout count to accessory view Signed-off-by: snipe --- resources/views/accessories/view.blade.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 82d7c8201a..59ff1b9c80 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -327,13 +327,22 @@
- Number remaining + {{ trans('admin/accessories/general.remaining') }}
{{ $accessory->numRemaining() }}
+
+
+ {{ trans('general.checked_out') }} +
+
+ {{ $accessory->users_count }} +
+
+ @can('checkout', \App\Models\Accessory::class) From 56090bc64534f73d9e2cab10ff4f70e4d97d65ef Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 21 Jan 2023 14:38:35 -0800 Subject: [PATCH 021/159] Re-ordered notes to be more consistent, fixed missing iCheck class Signed-off-by: snipe --- resources/views/accessories/edit.blade.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php index d6233d4e5a..c16e57cb22 100755 --- a/resources/views/accessories/edit.blade.php +++ b/resources/views/accessories/edit.blade.php @@ -21,22 +21,24 @@ @include ('partials.forms.edit.purchase_cost') @include ('partials.forms.edit.quantity') @include ('partials.forms.edit.minimum_quantity') - +@include ('partials.forms.edit.notes') @if ($item->image)
- {{ Form::checkbox('image_delete') }} - - {!! $errors->first('image_delete', '') !!} + +
+ +
@endif -@include ('partials.forms.edit.notes') - @include ('partials.forms.edit.image-upload') @stop From 46e3e8a3dd9b80e1c33b0a3af951ec547f8b638c Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 21 Jan 2023 14:39:53 -0800 Subject: [PATCH 022/159] Added new users_count field to API Signed-off-by: snipe --- app/Presenters/AccessoryPresenter.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php index 7d77acc8d7..cc4f9badfc 100644 --- a/app/Presenters/AccessoryPresenter.php +++ b/app/Presenters/AccessoryPresenter.php @@ -80,19 +80,25 @@ class AccessoryPresenter extends Presenter ], [ 'field' => 'qty', 'searchable' => false, - 'sortable' => false, - 'title' => trans('admin/accessories/general.total'), - ], [ - 'field' => 'min_qty', - 'searchable' => false, 'sortable' => true, - 'title' => trans('general.min_amt'), + 'title' => trans('admin/accessories/general.total'), ], [ 'field' => 'remaining_qty', 'searchable' => false, 'sortable' => false, 'visible' => false, 'title' => trans('admin/accessories/general.remaining'), + ],[ + 'field' => 'users_count', + 'searchable' => false, + 'sortable' => true, + 'visible' => true, + 'title' => trans('general.checked_out'), + ], [ + 'field' => 'min_qty', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('general.min_amt'), ], [ 'field' => 'purchase_date', 'searchable' => true, From dceb77d4d4a70df6a1ab0b4a70b1bf0ad500e64a Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 21 Jan 2023 14:40:20 -0800 Subject: [PATCH 023/159] Refactored numRemaining, removed unnecessary numCheckout Signed-off-by: snipe --- app/Models/Accessory.php | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index 3f2004b047..d39d653382 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -327,20 +327,6 @@ class Accessory extends SnipeModel return null; } - /** - * Check how many items within an accessory are checked out - * - * @author [A. Gianotto] [] - * @since [v5.0] - * @return int - */ - public function numCheckedOut() - { - $checkedout = 0; - $checkedout = $this->users->count(); - - return $checkedout; - } /** * Check how many items of an accessory remain @@ -351,11 +337,11 @@ class Accessory extends SnipeModel */ public function numRemaining() { - $checkedout = $this->users->count(); + $checkedout = $this->users_count; $total = $this->qty; $remaining = $total - $checkedout; - return $remaining; + return (int) $remaining; } /** From 90c16318201b45fa233e07ca19f0e4f8a38c7c54 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 21 Jan 2023 14:40:35 -0800 Subject: [PATCH 024/159] Added users_count to transformer for API Signed-off-by: snipe --- app/Http/Transformers/AccessoriesTransformer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php index 6f254b3b87..00c30f9ea2 100644 --- a/app/Http/Transformers/AccessoriesTransformer.php +++ b/app/Http/Transformers/AccessoriesTransformer.php @@ -38,7 +38,8 @@ class AccessoriesTransformer 'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost), 'order_number' => ($accessory->order_number) ? e($accessory->order_number) : null, 'min_qty' => ($accessory->min_amt) ? (int) $accessory->min_amt : null, - 'remaining_qty' => $accessory->numRemaining(), + 'remaining_qty' => (int) $accessory->numRemaining(), + 'users_count' => $accessory->users_count, 'created_at' => Helper::getFormattedDateObject($accessory->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($accessory->updated_at, 'datetime'), From 60eab08735187044240c3f180867411c9b772813 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 21 Jan 2023 14:41:07 -0800 Subject: [PATCH 025/159] =?UTF-8?q?Added=20`->with(=E2=80=98users=20as=20u?= =?UTF-8?q?sers=5Fcount=E2=80=99)`=20in=20Accessory=20query?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- .../Accessories/AccessoriesController.php | 74 +++++++++---------- .../Controllers/Api/AccessoriesController.php | 5 +- 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php index d1af79adf1..96f83d7665 100755 --- a/app/Http/Controllers/Accessories/AccessoriesController.php +++ b/app/Http/Controllers/Accessories/AccessoriesController.php @@ -127,45 +127,45 @@ class AccessoriesController extends Controller */ public function update(ImageUploadRequest $request, $accessoryId = null) { - if (is_null($accessory = Accessory::find($accessoryId))) { + if ($accessory = Accessory::withCount('users as users_count')->find($accessoryId)) { + + $validator = Validator::make($request->all(), [ + "qty" => "required|numeric|min:$accessory->users_count" + ]); + + if ($validator->fails()) { + return redirect()->back() + ->withErrors($validator) + ->withInput(); + } + + $this->authorize($accessory); + + // Update the accessory data + $accessory->name = request('name'); + $accessory->location_id = request('location_id'); + $accessory->min_amt = request('min_amt'); + $accessory->category_id = request('category_id'); + $accessory->company_id = Company::getIdForCurrentUser(request('company_id')); + $accessory->manufacturer_id = request('manufacturer_id'); + $accessory->order_number = request('order_number'); + $accessory->model_number = request('model_number'); + $accessory->purchase_date = request('purchase_date'); + $accessory->purchase_cost = Helper::ParseCurrency(request('purchase_cost')); + $accessory->qty = request('qty'); + $accessory->supplier_id = request('supplier_id'); + $accessory->notes = request('notes'); + + $accessory = $request->handleImages($accessory); + + // Was the accessory updated? + if ($accessory->save()) { + return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success')); + } + } else { return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist')); } - $min = $accessory->numCheckedOut(); - $validator = Validator::make($request->all(), [ - "qty" => "required|numeric|min:$min" - ]); - - if ($validator->fails()) { - return redirect()->back() - ->withErrors($validator) - ->withInput(); - } - - $this->authorize($accessory); - - // Update the accessory data - $accessory->name = request('name'); - $accessory->location_id = request('location_id'); - $accessory->min_amt = request('min_amt'); - $accessory->category_id = request('category_id'); - $accessory->company_id = Company::getIdForCurrentUser(request('company_id')); - $accessory->manufacturer_id = request('manufacturer_id'); - $accessory->order_number = request('order_number'); - $accessory->model_number = request('model_number'); - $accessory->purchase_date = request('purchase_date'); - $accessory->purchase_cost = Helper::ParseCurrency(request('purchase_cost')); - $accessory->qty = request('qty'); - $accessory->supplier_id = request('supplier_id'); - $accessory->notes = request('notes'); - - $accessory = $request->handleImages($accessory); - - // Was the accessory updated? - if ($accessory->save()) { - return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success')); - } - return redirect()->back()->withInput()->withErrors($accessory->getErrors()); } @@ -217,7 +217,7 @@ class AccessoriesController extends Controller */ public function show($accessoryID = null) { - $accessory = Accessory::find($accessoryID); + $accessory = Accessory::withCount('users as users_count')->find($accessoryID); $this->authorize('view', $accessory); if (isset($accessory->id)) { return view('accessories/view', compact('accessory')); diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php index a894dc3760..fd21ebaf3a 100644 --- a/app/Http/Controllers/Api/AccessoriesController.php +++ b/app/Http/Controllers/Api/AccessoriesController.php @@ -41,10 +41,13 @@ class AccessoriesController extends Controller 'min_amt', 'company_id', 'notes', + 'users_count', + 'qty', ]; - $accessories = Accessory::select('accessories.*')->with('category', 'company', 'manufacturer', 'users', 'location', 'supplier'); + $accessories = Accessory::select('accessories.*')->with('category', 'company', 'manufacturer', 'users', 'location', 'supplier') + ->withCount('users as users_count'); if ($request->filled('search')) { $accessories = $accessories->TextSearch($request->input('search')); From 2bdf3d3f44cc460c26f68949891ea16c5f0025c8 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 21 Jan 2023 14:44:10 -0800 Subject: [PATCH 026/159] Missed a few strong HTML tags Signed-off-by: snipe --- resources/views/accessories/view.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 59ff1b9c80..fd31722204 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -290,7 +290,7 @@ @if ($accessory->company)
- {{ trans('general.company')}} + {{ trans('general.company')}}
{{ $accessory->company->name }} @@ -302,7 +302,7 @@ @if ($accessory->category)
- {{ trans('general.category')}} + {{ trans('general.category')}}
{{ $accessory->category->name }} From e6dc61d2cffe712f9f0a77b78eed83f84ed7f5f1 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 23 Jan 2023 15:42:05 -0800 Subject: [PATCH 027/159] Revert column names to legacy versions in down method --- ...357_fix_utf8_custom_field_column_names.php | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php b/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php index 72e85698e0..4725cccfe1 100644 --- a/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php +++ b/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php @@ -4,6 +4,7 @@ use App\Models\CustomField; use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Str; /** * Fixes issue #2551 where columns got donked if the field name in non-ascii @@ -71,6 +72,25 @@ class FixUtf8CustomFieldColumnNames extends Migration */ public function down() { + // In the up method above, updateLegacyColumnName is called and custom fields in the assets table are prefixed + // with "_snipe_it_", suffixed with "_{id of the CustomField}", and stored in custom_fields.db_column. + // The following reverses those changes. + foreach (CustomField::all() as $field) { + $currentColumnName = $field->db_column; + + // "_snipeit_imei_1" becomes "_snipeit_imei" + $legacyColumnName = (string) Str::of($currentColumnName)->replaceMatches('/_(\d)+$/', ''); + + if (Schema::hasColumn(CustomField::$table_name, $currentColumnName)) { + Schema::table(CustomField::$table_name, function (Blueprint $table) use ($currentColumnName, $legacyColumnName) { + $table->renameColumn( + $currentColumnName, + $legacyColumnName + ); + }); + } + } + Schema::table('custom_fields', function ($table) { $table->dropColumn('db_column'); $table->dropColumn('help_text'); From 760844de6fb252bd7f979d8eaa6fa3a92283caf2 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 23 Jan 2023 15:42:33 -0800 Subject: [PATCH 028/159] Add conditionals --- .../2015_09_22_003413_migrate_mac_address.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/database/migrations/2015_09_22_003413_migrate_mac_address.php b/database/migrations/2015_09_22_003413_migrate_mac_address.php index 8167e28adf..3c4bf93e15 100644 --- a/database/migrations/2015_09_22_003413_migrate_mac_address.php +++ b/database/migrations/2015_09_22_003413_migrate_mac_address.php @@ -48,13 +48,19 @@ class MigrateMacAddress extends Migration */ public function down() { - // $f = \App\Models\CustomFieldset::where(['name' => 'Asset with MAC Address'])->first(); - $f->fields()->delete(); - $f->delete(); + + if ($f) { + $f->fields()->delete(); + $f->delete(); + } + Schema::table('models', function (Blueprint $table) { $table->renameColumn('deprecated_mac_address', 'show_mac_address'); }); - DB::statement('ALTER TABLE assets CHANGE _snipeit_mac_address_1 mac_address varchar(255)'); + + if (Schema::hasColumn('assets', '_snipeit_mac_address')) { + DB::statement('ALTER TABLE assets CHANGE _snipeit_mac_address mac_address varchar(255)'); + } } } From cd582be851b6dff9d1c3135ff3c0a7d79519ecae Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 23 Jan 2023 15:42:45 -0800 Subject: [PATCH 029/159] Drop tables that may exist in down methods --- ...2_12_06_225929_migration_cartalyst_sentry_install_groups.php | 1 + .../migrations/2013_11_25_031458_create_license_seats_table.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php b/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php index 49242f2e30..55d7318736 100644 --- a/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php +++ b/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php @@ -46,5 +46,6 @@ class MigrationCartalystSentryInstallGroups extends Migration { // See 2014_11_04_231416_update_group_field_for_reporting.php and 2019_06_12_184327_rename_groups_table.php Schema::dropIfExists('permission_groups'); + Schema::dropIfExists('groups'); } } diff --git a/database/migrations/2013_11_25_031458_create_license_seats_table.php b/database/migrations/2013_11_25_031458_create_license_seats_table.php index 466ef00870..d023b8ebec 100755 --- a/database/migrations/2013_11_25_031458_create_license_seats_table.php +++ b/database/migrations/2013_11_25_031458_create_license_seats_table.php @@ -31,6 +31,6 @@ class CreateLicenseSeatsTable extends Migration */ public function down() { - // + Schema::dropIfExists('license_seats'); } } From dc155846ca11d404aed416bf7bc0bc64f2252b1b Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 23 Jan 2023 21:49:17 -0800 Subject: [PATCH 030/159] =?UTF-8?q?Hoist=20the=20autorization=20higher=20i?= =?UTF-8?q?n=20the=20stack=20so=20we=E2=80=99re=20not=20doing=20logic=20or?= =?UTF-8?q?=20math=20when=20the=20user=20isn=E2=80=99t=20authorized=20to?= =?UTF-8?q?=20touch=20this?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- app/Http/Controllers/Accessories/AccessoriesController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php index 96f83d7665..f0b54a9498 100755 --- a/app/Http/Controllers/Accessories/AccessoriesController.php +++ b/app/Http/Controllers/Accessories/AccessoriesController.php @@ -63,6 +63,7 @@ class AccessoriesController extends Controller public function store(ImageUploadRequest $request) { $this->authorize(Accessory::class); + // create a new model instance $accessory = new Accessory(); @@ -82,7 +83,6 @@ class AccessoriesController extends Controller $accessory->supplier_id = request('supplier_id'); $accessory->notes = request('notes'); - $accessory = $request->handleImages($accessory); // Was the accessory created? @@ -129,6 +129,8 @@ class AccessoriesController extends Controller { if ($accessory = Accessory::withCount('users as users_count')->find($accessoryId)) { + $this->authorize($accessory); + $validator = Validator::make($request->all(), [ "qty" => "required|numeric|min:$accessory->users_count" ]); @@ -139,7 +141,7 @@ class AccessoriesController extends Controller ->withInput(); } - $this->authorize($accessory); + // Update the accessory data $accessory->name = request('name'); From 0f8ee220534b89fe5ef3b7a8f652ce306d3c0752 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 24 Jan 2023 09:25:05 -0800 Subject: [PATCH 031/159] Creates Slack Setting Form --- app/Http/Livewire/SlackSettingsForm.php | 21 +++++++++++++++++++ .../livewire/slack-settings-form.blade.php | 3 +++ 2 files changed, 24 insertions(+) create mode 100644 app/Http/Livewire/SlackSettingsForm.php create mode 100644 resources/views/livewire/slack-settings-form.blade.php diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php new file mode 100644 index 0000000000..c796ee53cc --- /dev/null +++ b/app/Http/Livewire/SlackSettingsForm.php @@ -0,0 +1,21 @@ + + {{-- In work, do what you enjoy. --}} +
From cafe8f3074276c33aba4cf7537c008de14f12351 Mon Sep 17 00:00:00 2001 From: akemidx Date: Tue, 24 Jan 2023 16:20:20 -0500 Subject: [PATCH 032/159] notification for slack message --- resources/views/consumables/checkout.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php index f768f78484..85cec320e2 100644 --- a/resources/views/consumables/checkout.blade.php +++ b/resources/views/consumables/checkout.blade.php @@ -60,7 +60,7 @@ @if ($snipeSettings->slack_endpoint!='') - A slack message will be sent + {{ trans('general.slack_msg_note') }} @endif
From 3c4f254583d8454a70c50f95538b7f61f4c7ba10 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Jan 2023 13:38:53 -0800 Subject: [PATCH 033/159] Enforce Y-m-d as date format for date fields Signed-off-by: snipe --- app/Models/Accessory.php | 1 + app/Models/Asset.php | 9 +++++---- app/Models/Component.php | 2 +- app/Models/Consumable.php | 1 + app/Models/License.php | 3 +++ app/Models/User.php | 4 ++-- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index 3f2004b047..9569917ab3 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -63,6 +63,7 @@ class Accessory extends SnipeModel 'company_id' => 'integer|nullable', 'min_amt' => 'integer|min:0|nullable', 'purchase_cost' => 'numeric|nullable|gte:0', + 'purchase_date' => 'date_format:Y-m-d|nullable', ]; diff --git a/app/Models/Asset.php b/app/Models/Asset.php index f8e0cab314..75e1f38e45 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -105,16 +105,17 @@ class Asset extends Depreciable 'company_id' => 'integer|nullable', 'warranty_months' => 'numeric|nullable|digits_between:0,240', 'physical' => 'numeric|max:1|nullable', - 'checkout_date' => 'date|max:10|min:10|nullable', - 'checkin_date' => 'date|max:10|min:10|nullable', + 'checkout_date' => 'date_format:Y-m-d|max:10|min:10|nullable', + 'checkin_date' => 'date_format:Y-m-d|max:10|min:10|nullable', 'location_id' => 'exists:locations,id|nullable', 'rtd_location_id' => 'exists:locations,id|nullable', 'asset_tag' => 'required|min:1|max:255|unique_undeleted', 'status' => 'integer', + 'purchase_date' => 'date_format:Y-m-d|nullable', 'serial' => 'unique_serial|nullable', 'purchase_cost' => 'numeric|nullable|gte:0', - 'next_audit_date' => 'date|nullable', - 'last_audit_date' => 'date|nullable', + 'next_audit_date' => 'date_format:Y-m-d|nullable', + 'last_audit_date' => 'date_format:Y-m-d|nullable', 'supplier_id' => 'exists:suppliers,id|nullable', ]; diff --git a/app/Models/Component.php b/app/Models/Component.php index dc353d288c..98230132be 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -35,7 +35,7 @@ class Component extends SnipeModel 'category_id' => 'required|integer|exists:categories,id', 'company_id' => 'integer|nullable', 'min_amt' => 'integer|min:0|nullable', - 'purchase_date' => 'date|nullable', + 'purchase_date' => 'date_format:Y-m-d|nullable', 'purchase_cost' => 'numeric|nullable|gte:0', ]; diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php index c04c9b53d5..ea4ac6086b 100644 --- a/app/Models/Consumable.php +++ b/app/Models/Consumable.php @@ -41,6 +41,7 @@ class Consumable extends SnipeModel 'company_id' => 'integer|nullable', 'min_amt' => 'integer|min:0|nullable', 'purchase_cost' => 'numeric|nullable|gte:0', + 'purchase_date' => 'date_format:Y-m-d|nullable', ]; /** diff --git a/app/Models/License.php b/app/Models/License.php index b59387a42e..d3c4d8a1c3 100755 --- a/app/Models/License.php +++ b/app/Models/License.php @@ -50,6 +50,9 @@ class License extends Depreciable 'category_id' => 'required|exists:categories,id', 'company_id' => 'integer|nullable', 'purchase_cost'=> 'numeric|nullable|gte:0', + 'purchase_date' => 'date_format:Y-m-d|nullable', + 'expiration_date' => 'date_format:Y-m-d|nullable', + 'termination_date' => 'date_format:Y-m-d|nullable', ]; /** diff --git a/app/Models/User.php b/app/Models/User.php index 34c0af6b2e..4d430af741 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -98,8 +98,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo 'website' => 'url|nullable|max:191', 'manager_id' => 'nullable|exists:users,id|cant_manage_self', 'location_id' => 'exists:locations,id|nullable', - 'start_date' => 'nullable|date', - 'end_date' => 'nullable|date|after_or_equal:start_date', + 'start_date' => 'nullable|date_format:Y-m-d', + 'end_date' => 'nullable|date_format:Y-m-d|after_or_equal:start_date', ]; /** From 3ba79600fb6e163c9afec105a345cfabeef07c56 Mon Sep 17 00:00:00 2001 From: akemidx Date: Tue, 24 Jan 2023 18:17:49 -0500 Subject: [PATCH 034/159] checkin limit for the components checkin --- resources/lang/en/admin/components/general.php | 1 + resources/views/components/checkin.blade.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/lang/en/admin/components/general.php b/resources/lang/en/admin/components/general.php index f7689a7ad1..5d93036054 100644 --- a/resources/lang/en/admin/components/general.php +++ b/resources/lang/en/admin/components/general.php @@ -12,4 +12,5 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Component', + 'checkin_limit' => 'Amount checked in must be equal to or less than this amount' ); diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php index 8dca260443..55822fb9cf 100644 --- a/resources/views/components/checkin.blade.php +++ b/resources/views/components/checkin.blade.php @@ -42,7 +42,7 @@
-

Must be {{ $component_assets->assigned_qty }} or less.

+

{{ trans(admin/components/general.checkin_limit) }}: {{ $component_assets->assigned_qty }}

{!! $errors->first('checkin_qty', '') !!}
From 91394f72624a501fde291c5631044e4bbb4fa261 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Jan 2023 17:23:06 -0800 Subject: [PATCH 035/159] Removed duplicate comment section Signed-off-by: snipe --- resources/lang/en/validation.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 04f8d65303..18387310f8 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -103,17 +103,6 @@ return [ ], - /* - |-------------------------------------------------------------------------- - | Custom Validation Language Lines - |-------------------------------------------------------------------------- - | - | Here you may specify custom validation messages for attributes using the - | convention "attribute.rule" to name the lines. This makes it quick to - | specify a specific custom language line for a given attribute rule. - | - */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines From a61ccbb9658da024185575fe017fe81b86b64776 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Jan 2023 17:33:49 -0800 Subject: [PATCH 036/159] Added very clunky but better error messages on that validation for date_format Signed-off-by: snipe --- resources/lang/en/validation.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 18387310f8..31c9dcd85d 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -120,6 +120,18 @@ return [ 'hashed_pass' => 'Your current password is incorrect', 'dumbpwd' => 'That password is too common.', 'statuslabel_type' => 'You must select a valid status label type', + + // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :( + // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP + // people won't know how to format. + 'purchase_date.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format', + 'last_audit_date.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format', + 'expiration_date.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format', + 'termination_date.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format', + 'expected_checkin.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format', + 'start_date.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format', + 'end_date.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format', + ], /* From fd2a057d384d9a57b6717fd92020e2f44c4f460f Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Jan 2023 17:36:58 -0800 Subject: [PATCH 037/159] Make audit dates fillable Signed-off-by: snipe --- app/Models/Asset.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 75e1f38e45..e3e2e96b0c 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -146,6 +146,9 @@ class Asset extends Depreciable 'last_checkout', 'expected_checkin', 'byod', + 'last_audit_date', + 'next_audit_date', + ]; use Searchable; From 9c79fc19cb6eab3f31d587120b1c9c9534a34dd9 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Jan 2023 17:37:15 -0800 Subject: [PATCH 038/159] =?UTF-8?q?Tightened=20up=20and=20removed=20some?= =?UTF-8?q?=20validation=20that=20wasn=E2=80=99t=20needed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- app/Models/Asset.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index e3e2e96b0c..3c1bc9beca 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -84,11 +84,11 @@ class Asset extends Depreciable protected $casts = [ - 'purchase_date' => 'datetime', + 'purchase_date' => 'date', 'last_checkout' => 'datetime', - 'expected_checkin' => 'datetime', + 'expected_checkin' => 'date', 'last_audit_date' => 'datetime', - 'next_audit_date' => 'datetime', + 'next_audit_date' => 'date', 'model_id' => 'integer', 'status_id' => 'integer', 'company_id' => 'integer', @@ -105,17 +105,14 @@ class Asset extends Depreciable 'company_id' => 'integer|nullable', 'warranty_months' => 'numeric|nullable|digits_between:0,240', 'physical' => 'numeric|max:1|nullable', - 'checkout_date' => 'date_format:Y-m-d|max:10|min:10|nullable', - 'checkin_date' => 'date_format:Y-m-d|max:10|min:10|nullable', + 'last_checkout' => 'date|date_format:Y-m-d H:i:s|nullable', + 'expected_checkin' => 'date|date_format:Y-m-d|nullable', 'location_id' => 'exists:locations,id|nullable', 'rtd_location_id' => 'exists:locations,id|nullable', 'asset_tag' => 'required|min:1|max:255|unique_undeleted', - 'status' => 'integer', - 'purchase_date' => 'date_format:Y-m-d|nullable', + 'purchase_date' => 'date|date_format:Y-m-d|nullable', 'serial' => 'unique_serial|nullable', 'purchase_cost' => 'numeric|nullable|gte:0', - 'next_audit_date' => 'date_format:Y-m-d|nullable', - 'last_audit_date' => 'date_format:Y-m-d|nullable', 'supplier_id' => 'exists:suppliers,id|nullable', ]; From 2e22eeade548c18228a9852e63a0472051bad29e Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 25 Jan 2023 14:29:20 -0800 Subject: [PATCH 039/159] adds one input --- app/Http/Livewire/SlackSettingsForm.php | 5 +++++ .../livewire/slack-settings-form.blade.php | 19 ++++++++++++++++++- resources/views/settings/slack.blade.php | 17 +---------------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php index c796ee53cc..0193aa7daf 100644 --- a/app/Http/Livewire/SlackSettingsForm.php +++ b/app/Http/Livewire/SlackSettingsForm.php @@ -11,6 +11,11 @@ class SlackSettingsForm extends Component { public Setting $setting; + protected $rules = [ + 'setting.slack_endpoint' => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable', + 'setting.slack_channel' => 'required_with:slack_endpoint|starts_with:#|nullable', + 'setting.slack_botname' => 'string|nullable', + ]; public function render() diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index cdda2ce1ff..4846aa95fb 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -1,3 +1,20 @@
- {{-- In work, do what you enjoy. --}} +
+
+
+ {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }} +
+
+ @if (config('app.lock_passwords')===true) + {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} +

{{ trans('general.feature_disabled') }}

+ slack_endpoint)}} > + @else + slack_endpoint)}} > + {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} + @endif + {!! $errors->first('slack_endpoint', '') !!} +
+
+
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php index 705510ab8e..f5f21c5aa9 100644 --- a/resources/views/settings/slack.blade.php +++ b/resources/views/settings/slack.blade.php @@ -50,22 +50,7 @@
- -
-
- {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }} -
-
- @if (config('app.lock_passwords')===true) - {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }} -

{{ trans('general.feature_disabled') }}

- - @else - {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }} - @endif - {!! $errors->first('slack_endpoint', '') !!} -
-
+ @livewire('slack-settings-form', ['setting' => $setting])
From 91cf683f3db002299d9237c1411f4969804ed339 Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Thu, 10 Nov 2022 17:14:37 +0000 Subject: [PATCH 040/159] Re-do the entire SCIM config so it no longer inherits --- app/Models/SnipeSCIMConfig.php | 328 ++++++++++++++++++++------------- 1 file changed, 195 insertions(+), 133 deletions(-) diff --git a/app/Models/SnipeSCIMConfig.php b/app/Models/SnipeSCIMConfig.php index 36a9ac855c..ea442bbdda 100644 --- a/app/Models/SnipeSCIMConfig.php +++ b/app/Models/SnipeSCIMConfig.php @@ -12,94 +12,9 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig { public function getUserConfig() { - $config = parent::getUserConfig(); - // Much of this is copied verbatim from the library, then adjusted for our needs - $config['class'] = SCIMUser::class; - unset($config['mapping']['example:name:space']); - - $config['map_unmapped'] = false; // anything we don't explicitly map will _not_ show up. - - $core_namespace = 'urn:ietf:params:scim:schemas:core:2.0:User'; - $core = $core_namespace.':'; - $mappings =& $config['mapping'][$core_namespace]; //grab this entire key, we don't want to be repeating ourselves - - //username - *REQUIRED* - $config['validations'][$core.'userName'] = 'required'; - $mappings['userName'] = AttributeMapping::eloquent('username'); - - //human name - *FIRST NAME REQUIRED* - $config['validations'][$core.'name.givenName'] = 'required'; - $config['validations'][$core.'name.familyName'] = 'string'; //not required - - $mappings['name']['familyName'] = AttributeMapping::eloquent("last_name"); - $mappings['name']['givenName'] = AttributeMapping::eloquent("first_name"); - $mappings['name']['formatted'] = (new AttributeMapping())->ignoreWrite()->setRead( - function (&$object) { - return $object->getFullNameAttribute(); - } - ); - - // externalId support - $config['validations'][$core.'externalId'] = 'string|nullable'; // not required, but supported mostly just for Okta - // note that the mapping is *not* namespaced like the other $mappings - $config['mapping']['externalId'] = AttributeMapping::eloquent('scim_externalid'); - - $config['validations'][$core.'emails'] = 'nullable|array'; // emails are not required in Snipe-IT... - $config['validations'][$core.'emails.*.value'] = 'email'; // ...(had to remove the recommended 'required' here) - - $mappings['emails'] = [[ - "value" => AttributeMapping::eloquent("email"), - "display" => null, - "type" => AttributeMapping::constant("work")->ignoreWrite(), - "primary" => AttributeMapping::constant(true)->ignoreWrite() - ]]; - - //active - $config['validations'][$core.'active'] = 'boolean'; - - $mappings['active'] = AttributeMapping::eloquent('activated'); - - //phone - $config['validations'][$core.'phoneNumbers'] = 'nullable|array'; - $config['validations'][$core.'phoneNumbers.*.value'] = 'string'; // another one where want to say 'we don't _need_ a phone number, but if you have one it better have a value. - - $mappings['phoneNumbers'] = [[ - "value" => AttributeMapping::eloquent("phone"), - "display" => null, - "type" => AttributeMapping::constant("work")->ignoreWrite(), - "primary" => AttributeMapping::constant(true)->ignoreWrite() - ]]; - - //address - $config['validations'][$core.'addresses'] = 'nullable|array'; - $config['validations'][$core.'addresses.*.streetAddress'] = 'string'; - $config['validations'][$core.'addresses.*.locality'] = 'string'; - $config['validations'][$core.'addresses.*.region'] = 'nullable|string'; - $config['validations'][$core.'addresses.*.postalCode'] = 'nullable|string'; - $config['validations'][$core.'addresses.*.country'] = 'string'; - - $mappings['addresses'] = [[ - 'type' => AttributeMapping::constant("work")->ignoreWrite(), - 'formatted' => AttributeMapping::constant("n/a")->ignoreWrite(), // TODO - is this right? This doesn't look right. - 'streetAddress' => AttributeMapping::eloquent("address"), - 'locality' => AttributeMapping::eloquent("city"), - 'region' => AttributeMapping::eloquent("state"), - 'postalCode' => AttributeMapping::eloquent("zip"), - 'country' => AttributeMapping::eloquent("country"), - 'primary' => AttributeMapping::constant(true)->ignoreWrite() //this isn't in the example? - ]]; - - //title - $config['validations'][$core.'title'] = 'string'; - $mappings['title'] = AttributeMapping::eloquent('jobtitle'); - - //Preferred Language - $config['validations'][$core.'preferredLanguage'] = 'string'; - $mappings['preferredLanguage'] = AttributeMapping::eloquent('locale'); - - /* + /* more snipe-it attributes I'd like to check out (to map to 'enterprise' maybe?): - website - notes? @@ -108,66 +23,213 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig - company_id to "organization?" */ - $enterprise_namespace = 'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User'; - $ent = $enterprise_namespace.':'; - // we remove the 'example' namespace and add the Enterprise one - $config['mapping']['schemas'] = AttributeMapping::constant( [$core_namespace, $enterprise_namespace] )->ignoreWrite(); + $user_prefix = 'urn:ietf:params:scim:schemas:core:2.0:User:'; + $enterprise_prefix = 'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:'; - $config['validations'][$ent.'employeeNumber'] = 'string'; - $config['validations'][$ent.'department'] = 'string'; - $config['validations'][$ent.'manager'] = 'nullable'; - $config['validations'][$ent.'manager.value'] = 'string'; + return [ - $config['mapping'][$enterprise_namespace] = [ - 'employeeNumber' => AttributeMapping::eloquent('employee_num'), - 'department' =>(new AttributeMapping())->setAdd( // FIXME parent? - function ($value, &$object) { - $department = Department::where("name", $value)->first(); - if ($department) { - $object->department_id = $department->id; - } - } - )->setReplace( - function ($value, &$object) { - $department = Department::where("name", $value)->first(); - if ($department) { - $object->department_id = $department->id; + // Set to 'null' to make use of auth.providers.users.model (App\User::class) + 'class' => SCIMUser::class, + + 'validations' => [ + $user_prefix . 'userName' => 'required', + $user_prefix . 'name.givenName' => 'required', + $user_prefix . 'name.familyName' => 'string', + $user_prefix . 'externalId' => 'string|nullable', + $user_prefix . 'emails' => 'nullable|array', + $user_prefix . 'emails.*.value' => 'email', + $user_prefix . 'active' => 'boolean', + $user_prefix . 'phoneNumbers' => 'nullable|array', + $user_prefix . 'phoneNumbers.*.value' => 'string', + $user_prefix . 'addresses' => 'nullable|array', + $user_prefix . 'addresses.*.streetAddress' => 'string', + $user_prefix . 'addresses.*.locality' => 'string', + $user_prefix . 'addresses.*.region' => 'nullable|string', + $user_prefix . 'addresses.*.postalCode' => 'nullable|string', + $user_prefix . 'addresses.*.country' => 'string', + $user_prefix . 'title' => 'string', + $user_prefix . 'preferredLanguage' => 'string', + + // Enterprise validations: + $enterprise_prefix . 'employeeNumber' => 'string', + $enterprise_prefix . 'department' => 'string', + $enterprise_prefix . 'manager' => 'nullable', + $enterprise_prefix . 'manager.value' => 'string' + ], + + 'singular' => 'User', + 'schema' => [Schema::SCHEMA_USER], + + //eager loading + 'withRelations' => [], + 'map_unmapped' => false, +// 'unmapped_namespace' => 'urn:ietf:params:scim:schemas:laravel:unmapped', + 'description' => 'User Account', + + // Map a SCIM attribute to an attribute of the object. + 'mapping' => [ + + 'id' => AttributeMapping::eloquent("id")->disableWrite(), + + 'externalId' => AttributeMapping::eloquent('scim_externalid'), // FIXME - I have a PR that changes a lot of this. + + 'meta' => [ + 'created' => AttributeMapping::eloquent("created_at")->disableWrite(), + 'lastModified' => AttributeMapping::eloquent("updated_at")->disableWrite(), + + 'location' => (new AttributeMapping())->setRead( + function ($object) { + return route( + 'scim.resource', + [ + 'resourceType' => 'Users', + 'resourceObject' => $object->id + ] + ); } - } - )->setRead( - function (&$object) { - return $object->department ? $object->department->name : null; - } - ), - 'manager' => [ - // FIXME - manager writes are disabled. This kinda works but it leaks errors all over the place. Not cool. - // '$ref' => (new AttributeMapping())->ignoreWrite()->ignoreRead(), - // 'displayName' => (new AttributeMapping())->ignoreWrite()->ignoreRead(), - // NOTE: you could probably do a 'plain' Eloquent mapping here, but we don't for future-proofing - 'value' => (new AttributeMapping())->setAdd( - function ($value, &$object) { - $manager = User::find($value); - if ($manager) { - $object->manager_id = $manager->id; + )->disableWrite(), + + 'resourceType' => AttributeMapping::constant("User") + ], + + 'schemas' => AttributeMapping::constant( + [ + 'urn:ietf:params:scim:schemas:core:2.0:User', + 'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User' + ] + )->ignoreWrite(), + + 'urn:ietf:params:scim:schemas:core:2.0:User' => [ + + 'userName' => AttributeMapping::eloquent("username"), + + 'name' => [ + 'formatted' => (new AttributeMapping())->ignoreWrite()->setRead( + function (&$object) { + return $object->getFullNameAttribute(); + } + ), + 'familyName' => AttributeMapping::eloquent("last_name"), + 'givenName' => AttributeMapping::eloquent("first_name"), + 'middleName' => null, + 'honorificPrefix' => null, + 'honorificSuffix' => null + ], + + 'displayName' => null, + 'nickName' => null, + 'profileUrl' => null, + 'title' => AttributeMapping::eloquent('jobtitle'), + 'userType' => null, + 'preferredLanguage' => AttributeMapping::eloquent('locale'), // Section 5.3.5 of [RFC7231] + 'locale' => null, // see RFC5646 + 'timezone' => null, // see RFC6557 + 'active' => AttributeMapping::eloquent('activated'), + + 'password' => AttributeMapping::eloquent('password')->disableRead(), + + // Multi-Valued Attributes + 'emails' => [[ + "value" => AttributeMapping::eloquent("email"), + "display" => null, + "type" => AttributeMapping::constant("work")->ignoreWrite(), + "primary" => AttributeMapping::constant(true)->ignoreWrite() + ]], + + 'phoneNumbers' => [[ + "value" => AttributeMapping::eloquent("phone"), + "display" => null, + "type" => AttributeMapping::constant("work")->ignoreWrite(), + "primary" => AttributeMapping::constant(true)->ignoreWrite() + ]], + + 'ims' => [[ + "value" => null, + "display" => null, + "type" => null, + "primary" => null + ]], // Instant messaging addresses for the User + + 'photos' => [[ + "value" => null, + "display" => null, + "type" => null, + "primary" => null + ]], + + 'addresses' => [[ + 'type' => AttributeMapping::constant("work")->ignoreWrite(), + 'formatted' => AttributeMapping::constant("n/a")->ignoreWrite(), // TODO - is this right? This doesn't look right. + 'streetAddress' => AttributeMapping::eloquent("address"), + 'locality' => AttributeMapping::eloquent("city"), + 'region' => AttributeMapping::eloquent("state"), + 'postalCode' => AttributeMapping::eloquent("zip"), + 'country' => AttributeMapping::eloquent("country"), + 'primary' => AttributeMapping::constant(true)->ignoreWrite() //this isn't in the example? + ]], + + 'groups' => [[ + 'value' => null, + '$ref' => null, + 'display' => null, + 'type' => null, + 'type' => null + ]], + + 'entitlements' => null, + 'roles' => null, + 'x509Certificates' => null + ], + + 'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User' => [ + 'employeeNumber' => AttributeMapping::eloquent('employee_num'), + 'department' => (new AttributeMapping())->setAdd( // FIXME parent? + function ($value, &$object) { + $department = Department::where("name", $value)->first(); + if ($department) { + $object->department_id = $department->id; + } } - } )->setReplace( function ($value, &$object) { - $manager = User::find($value); - if ($manager) { - $object->manager_id = $manager->id; + $department = Department::where("name", $value)->first(); + if ($department) { + $object->department_id = $department->id; } } )->setRead( function (&$object) { - return $object->manager_id; - } + return $object->department ? $object->department->name : null; + } ), + 'manager' => [ + // FIXME - manager writes are disabled. This kinda works but it leaks errors all over the place. Not cool. + // '$ref' => (new AttributeMapping())->ignoreWrite()->ignoreRead(), + // 'displayName' => (new AttributeMapping())->ignoreWrite()->ignoreRead(), + // NOTE: you could probably do a 'plain' Eloquent mapping here, but we don't for future-proofing + 'value' => (new AttributeMapping())->setAdd( + function ($value, &$object) { + $manager = User::find($value); + if ($manager) { + $object->manager_id = $manager->id; + } + } + )->setReplace( + function ($value, &$object) { + $manager = User::find($value); + if ($manager) { + $object->manager_id = $manager->id; + } + } + )->setRead( + function (&$object) { + return $object->manager_id; + } + ), + ] + ] ] ]; - - return $config; } - } From cfe9c687f980dfab7656fcaffe7675a8bc1c1b9d Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Wed, 4 Jan 2023 12:17:08 -0800 Subject: [PATCH 041/159] Mark a bunch of SCIM config as nullable --- app/Models/SnipeSCIMConfig.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Models/SnipeSCIMConfig.php b/app/Models/SnipeSCIMConfig.php index ea442bbdda..77cbf01c1a 100644 --- a/app/Models/SnipeSCIMConfig.php +++ b/app/Models/SnipeSCIMConfig.php @@ -35,27 +35,27 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig 'validations' => [ $user_prefix . 'userName' => 'required', $user_prefix . 'name.givenName' => 'required', - $user_prefix . 'name.familyName' => 'string', - $user_prefix . 'externalId' => 'string|nullable', + $user_prefix . 'name.familyName' => 'nullable|string', + $user_prefix . 'externalId' => 'nullable|string', $user_prefix . 'emails' => 'nullable|array', - $user_prefix . 'emails.*.value' => 'email', + $user_prefix . 'emails.*.value' => 'nullable|email', $user_prefix . 'active' => 'boolean', $user_prefix . 'phoneNumbers' => 'nullable|array', - $user_prefix . 'phoneNumbers.*.value' => 'string', + $user_prefix . 'phoneNumbers.*.value' => 'nullable|string', $user_prefix . 'addresses' => 'nullable|array', - $user_prefix . 'addresses.*.streetAddress' => 'string', - $user_prefix . 'addresses.*.locality' => 'string', + $user_prefix . 'addresses.*.streetAddress' => 'nullable|string', + $user_prefix . 'addresses.*.locality' => 'nullable|string', $user_prefix . 'addresses.*.region' => 'nullable|string', $user_prefix . 'addresses.*.postalCode' => 'nullable|string', - $user_prefix . 'addresses.*.country' => 'string', - $user_prefix . 'title' => 'string', - $user_prefix . 'preferredLanguage' => 'string', + $user_prefix . 'addresses.*.country' => 'nullable|string', + $user_prefix . 'title' => 'nullable|string', + $user_prefix . 'preferredLanguage' => 'nullable|string', // Enterprise validations: - $enterprise_prefix . 'employeeNumber' => 'string', - $enterprise_prefix . 'department' => 'string', + $enterprise_prefix . 'employeeNumber' => 'nullable|string', + $enterprise_prefix . 'department' => 'nullable|string', $enterprise_prefix . 'manager' => 'nullable', - $enterprise_prefix . 'manager.value' => 'string' + $enterprise_prefix . 'manager.value' => 'nullable|string' ], 'singular' => 'User', From c5d3b3ab8155f485eef6b64af70205be22f75044 Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Wed, 11 Jan 2023 17:15:52 -0800 Subject: [PATCH 042/159] Change out the SCIM config for a fixed one; update our fork of the SCIM-server --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index bf8cb1f758..d6067c5e27 100644 --- a/composer.lock +++ b/composer.lock @@ -78,12 +78,12 @@ "source": { "type": "git", "url": "https://github.com/grokability/laravel-scim-server.git", - "reference": "2c7ecc450eee59234e059ec2e7724b2d8f3a8369" + "reference": "9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/2c7ecc450eee59234e059ec2e7724b2d8f3a8369", - "reference": "2c7ecc450eee59234e059ec2e7724b2d8f3a8369", + "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419", + "reference": "9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419", "shasum": "" }, "require": { @@ -133,7 +133,7 @@ "support": { "source": "https://github.com/grokability/laravel-scim-server/tree/master" }, - "time": "2022-11-22T20:26:54+00:00" + "time": "2023-01-12T00:32:07+00:00" }, { "name": "asm89/stack-cors", From a69cb6204a603edf4d861dffed532f5e8784b62f Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 25 Jan 2023 16:22:34 -0800 Subject: [PATCH 043/159] adds rest of inputs, and corrects Data binding --- app/Http/Livewire/SlackSettingsForm.php | 29 ++++++++++++-- .../livewire/slack-settings-form.blade.php | 40 ++++++++++++++++++- resources/views/settings/slack.blade.php | 34 +--------------- 3 files changed, 65 insertions(+), 38 deletions(-) diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php index 0193aa7daf..42d5a70824 100644 --- a/app/Http/Livewire/SlackSettingsForm.php +++ b/app/Http/Livewire/SlackSettingsForm.php @@ -4,23 +4,46 @@ namespace App\Http\Livewire; use Livewire\Component; use App\Models\Setting; +use App\Http\Requests\Request; class SlackSettingsForm extends Component { + public $slack_endpoint; + public $slack_channel; + public $slack_botname; + public Setting $setting; protected $rules = [ - 'setting.slack_endpoint' => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable', - 'setting.slack_channel' => 'required_with:slack_endpoint|starts_with:#|nullable', - 'setting.slack_botname' => 'string|nullable', + 'slack_endpoint' => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable', + 'slack_channel' => 'required_with:slack_endpoint|starts_with:#|nullable', + 'slack_botname' => 'string|nullable', ]; + public function mount(){ + + $this->setting= Setting::getSettings(); + $this->slack_endpoint = $this->setting->slack_endpoint; + $this->slack_channel = $this->setting->slack_channel; + $this->slack_botname = $this->setting->slack_botname; + + } public function render() { return view('livewire.slack-settings-form'); } + public function submit() + { + + $this->validate(); + + $this->setting->slack_endpoint = $this->slack_endpoint; + $this->setting->slack_channel = $this->slack_channel; + $this->setting->slack_botname = $this->slack_botname; + + } } diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index 4846aa95fb..cd7978f08e 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -8,13 +8,49 @@ @if (config('app.lock_passwords')===true) {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}}

{{ trans('general.feature_disabled') }}

- slack_endpoint)}} > + @else - slack_endpoint)}} > + {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} @endif {!! $errors->first('slack_endpoint', '') !!}
+ + +
+
+ {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }} +
+
+ @if (config('app.lock_passwords')===true) + +

{{ trans('general.feature_disabled') }}

+ + @else + + @endif + {!! $errors->first('slack_channel', '') !!} +
+
+ + +
+
+ {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }} +
+
+ @if (config('app.lock_passwords')===true) + {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }} + + +

{{ trans('general.feature_disabled') }}

+ + @else + + @endif + {!! $errors->first('slack_botname', '') !!} +
+
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php index f5f21c5aa9..6bbd321662 100644 --- a/resources/views/settings/slack.blade.php +++ b/resources/views/settings/slack.blade.php @@ -50,41 +50,9 @@
- @livewire('slack-settings-form', ['setting' => $setting]) + @livewire('slack-settings-form') - -
-
- {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }} -
-
- @if (config('app.lock_passwords')===true) - {{ Form::text('slack_channel', old('slack_channel', $setting->slack_channel), array('class' => 'form-control','disabled'=>'disabled','placeholder' => '#IT-Ops')) }} -

{{ trans('general.feature_disabled') }}

- @else - {{ Form::text('slack_channel', old('slack_channel', $setting->slack_channel), array('class' => 'form-control','placeholder' => '#IT-Ops')) }} - @endif - {!! $errors->first('slack_channel', '') !!} -
-
- - -
-
- {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }} -
-
- @if (config('app.lock_passwords')===true) - {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }} -

{{ trans('general.feature_disabled') }}

- - @else - {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','placeholder' => 'Snipe-Bot')) }} - @endif - {!! $errors->first('slack_botname', '') !!} -
-
- +
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 2b3cdbc19e..bdb03d3147 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -36,8 +36,8 @@ @else - This asset's model is invalid! - The asset should be edited to correct this before attempting to check it in or out. + {{ trans('admin/hardware/general.model_invalid')}} + {{ trans(admin/hardware/general.model_invalid_fix')}} @endif

diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php index b2075c51d0..8884821809 100644 --- a/resources/views/hardware/quickscan-checkin.blade.php +++ b/resources/views/hardware/quickscan-checkin.blade.php @@ -73,7 +73,7 @@
@@ -88,129 +80,129 @@ @stop -@push('js') - +{{-- --}} -@endpush +{{--@endpush--}} From 37f5cfa8ce0844edc65cc4e329d8a70a8fc6f845 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 26 Jan 2023 17:02:53 -0800 Subject: [PATCH 050/159] Added edit button for fieldsets Signed-off-by: snipe --- resources/views/custom_fields/index.blade.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php index 08c43cdd7b..d2435d7db5 100644 --- a/resources/views/custom_fields/index.blade.php +++ b/resources/views/custom_fields/index.blade.php @@ -69,8 +69,18 @@ @endforeach + + + + @can('update', $fieldset) + + + {{ trans('button.edit') }} + + @endcan + @can('delete', $fieldset) - {{ Form::open(['route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete']) }} + {{ Form::open(['route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete','style' => 'display:inline-block']) }} @if($fieldset->models->count() > 0) @else @@ -78,6 +88,7 @@ @endif {{ Form::close() }} @endcan + @endforeach From a16604285c5d8460f559af3c5eadbffa433c06cd Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 26 Jan 2023 17:03:07 -0800 Subject: [PATCH 051/159] Normalize the fieldset form Signed-off-by: snipe --- .../custom_fields/fieldsets/edit.blade.php | 58 ++++--------------- 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/resources/views/custom_fields/fieldsets/edit.blade.php b/resources/views/custom_fields/fieldsets/edit.blade.php index 04885891ec..a43769255d 100644 --- a/resources/views/custom_fields/fieldsets/edit.blade.php +++ b/resources/views/custom_fields/fieldsets/edit.blade.php @@ -1,49 +1,13 @@ -@extends('layouts.default') +@extends('layouts/edit-form', [ + 'createText' => trans('admin/custom_fields/general.create_fieldset') , + 'updateText' => trans('admin/custom_fields/general.update_fieldset'), + 'formAction' => (isset($item->id)) ? route('fieldsets.update', ['fieldset' => $item->id]) : route('fieldsets.store'), +]) + +@section('inputFields') + + @include ('partials.forms.edit.name', ['translated_name' => trans('general.name')]) + + -{{-- Page title --}} -@section('title') - {{ trans('admin/custom_fields/general.create_fieldset') }} -@parent -@stop - -@section('header_right') - - {{ trans('general.back') }} -@stop - - -{{-- Page content --}} -@section('content') -
-
- - {{ Form::open(['route' => 'fieldsets.store', 'class'=>'form-horizontal']) }} - -
-
- - -
- -
- - {!! $errors->first('name', '') !!} -
-
- -
-
- -
- -
- {{ Form::close() }} -
-
-

{{ trans('admin/custom_fields/general.about_fieldsets_title') }}

-

{{ trans('admin/custom_fields/general.about_fieldsets_text') }}

-
-
@stop From 583a0412fedba46f36598c5ddc65eb461d55ccc8 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 26 Jan 2023 17:03:23 -0800 Subject: [PATCH 052/159] Added edit fieldsets translations Signed-off-by: snipe --- .../Controllers/CustomFieldsetsController.php | 61 +++++++++++++------ .../lang/en/admin/custom_fields/general.php | 3 + 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php index c7c00a7bd2..bee0f38e27 100644 --- a/app/Http/Controllers/CustomFieldsetsController.php +++ b/app/Http/Controllers/CustomFieldsetsController.php @@ -75,9 +75,9 @@ class CustomFieldsetsController extends Controller */ public function create() { - $this->authorize('create', CustomFieldset::class); + $this->authorize('create', CustomField::class); - return view('custom_fields.fieldsets.edit'); + return view('custom_fields.fieldsets.edit')->with('item', new CustomFieldset()); } /** @@ -91,7 +91,7 @@ class CustomFieldsetsController extends Controller */ public function store(Request $request) { - $this->authorize('create', CustomFieldset::class); + $this->authorize('create', CustomField::class); $cfset = new CustomFieldset([ 'name' => e($request->get('name')), @@ -110,31 +110,52 @@ class CustomFieldsetsController extends Controller } /** - * What the actual fuck, Brady? + * Presents edit form for fieldset * - * @todo Uhh, build this? - * @author [Brady Wetherington] [] + * @author [A. Gianotto] [] * @param int $id - * @since [v1.8] - * @return Fuckall + * @since [v6.0.14] + * @return Redirect + * @throws \Illuminate\Auth\Access\AuthorizationException */ public function edit($id) { - // + $this->authorize('create', CustomField::class); + + if ($fieldset = CustomFieldset::find($id)) { + return view('custom_fields.fieldsets.edit')->with('item', $fieldset); + } + + return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id])); + } /** - * GET IN THE SEA BRADY. + * Saves updated fieldset data * - * @todo Uhh, build this too? - * @author [Brady Wetherington] [] + * @author [A. Gianotto] [] * @param int $id - * @since [v1.8] - * @return Fuckall + * @since [v6.0.14] + * @return Redirect + * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function update($id) + public function update(Request $request, $id) { - // + $this->authorize('create', CustomField::class); + + if ($fieldset = CustomFieldset::find($id)) { + + $fieldset->name = $request->input('name'); + + if ($fieldset->save()) { + return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/general.fieldset_updated')); + } + + return redirect()->back()->withInput()->withErrors($fieldset->getErrors()); + + } + + return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id])); } /** @@ -148,7 +169,7 @@ class CustomFieldsetsController extends Controller */ public function destroy($id) { - $fieldset = CustomFieldset::find($id); + $fieldset = CustomField::find($id); $this->authorize('delete', $fieldset); @@ -175,7 +196,7 @@ class CustomFieldsetsController extends Controller */ public function associate(Request $request, $id) { - $set = CustomFieldset::find($id); + $set = CustomField::find($id); $this->authorize('update', $set); @@ -202,7 +223,7 @@ class CustomFieldsetsController extends Controller */ public function makeFieldRequired($fieldset_id, $field_id) { - $this->authorize('update', CustomFieldset::class); + $this->authorize('update', CustomField::class); $field = CustomField::findOrFail($field_id); $fieldset = CustomFieldset::findOrFail($fieldset_id); $fields[$field->id] = ['required' => 1]; @@ -220,7 +241,7 @@ class CustomFieldsetsController extends Controller */ public function makeFieldOptional($fieldset_id, $field_id) { - $this->authorize('update', CustomFieldset::class); + $this->authorize('update', CustomField::class); $field = CustomField::findOrFail($field_id); $fieldset = CustomFieldset::findOrFail($fieldset_id); $fields[$field->id] = ['required' => 0]; diff --git a/resources/lang/en/admin/custom_fields/general.php b/resources/lang/en/admin/custom_fields/general.php index 92bf240a76..9dae380aa5 100644 --- a/resources/lang/en/admin/custom_fields/general.php +++ b/resources/lang/en/admin/custom_fields/general.php @@ -27,6 +27,9 @@ return [ 'used_by_models' => 'Used By Models', 'order' => 'Order', 'create_fieldset' => 'New Fieldset', + 'update_fieldset' => 'Update Fieldset', + 'fieldset_does_not_exist' => 'Fieldset :id does not exist', + 'fieldset_updated' => 'Fieldset updated', 'create_fieldset_title' => 'Create a new fieldset', 'create_field' => 'New Custom Field', 'create_field_title' => 'Create a new custom field', From 22b0b9b090b0fc85fa1209cd6fa3a978666383d4 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 26 Jan 2023 17:05:41 -0800 Subject: [PATCH 053/159] Fixed gates on fieldsets Signed-off-by: snipe --- .../Controllers/Api/CustomFieldsetsController.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Api/CustomFieldsetsController.php b/app/Http/Controllers/Api/CustomFieldsetsController.php index 18da1b67c2..27da7733cd 100644 --- a/app/Http/Controllers/Api/CustomFieldsetsController.php +++ b/app/Http/Controllers/Api/CustomFieldsetsController.php @@ -33,7 +33,7 @@ class CustomFieldsetsController extends Controller */ public function index() { - $this->authorize('index', CustomFieldset::class); + $this->authorize('index', CustomField::class); $fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count')->get(); return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $fieldsets->count()); @@ -49,7 +49,7 @@ class CustomFieldsetsController extends Controller */ public function show($id) { - $this->authorize('view', CustomFieldset::class); + $this->authorize('view', CustomField::class); if ($fieldset = CustomFieldset::find($id)) { return (new CustomFieldsetsTransformer)->transformCustomFieldset($fieldset); } @@ -68,7 +68,7 @@ class CustomFieldsetsController extends Controller */ public function update(Request $request, $id) { - $this->authorize('update', CustomFieldset::class); + $this->authorize('update', CustomField::class); $fieldset = CustomFieldset::findOrFail($id); $fieldset->fill($request->all()); @@ -89,7 +89,7 @@ class CustomFieldsetsController extends Controller */ public function store(Request $request) { - $this->authorize('create', CustomFieldset::class); + $this->authorize('create', CustomField::class); $fieldset = new CustomFieldset; $fieldset->fill($request->all()); @@ -109,7 +109,7 @@ class CustomFieldsetsController extends Controller */ public function destroy($id) { - $this->authorize('delete', CustomFieldset::class); + $this->authorize('delete', CustomField::class); $fieldset = CustomFieldset::findOrFail($id); $modelsCount = $fieldset->models->count(); @@ -136,7 +136,7 @@ class CustomFieldsetsController extends Controller */ public function fields($id) { - $this->authorize('view', CustomFieldset::class); + $this->authorize('view', CustomField::class); $set = CustomFieldset::findOrFail($id); $fields = $set->fields; @@ -153,7 +153,7 @@ class CustomFieldsetsController extends Controller */ public function fieldsWithDefaultValues($fieldsetId, $modelId) { - $this->authorize('view', CustomFieldset::class); + $this->authorize('view', CustomField::class); $set = CustomFieldset::findOrFail($fieldsetId); From c2854f1bcb79a9f0fbe8342a4993e9c375b16f57 Mon Sep 17 00:00:00 2001 From: Ben Periton <104396+benperiton@users.noreply.github.com> Date: Tue, 18 Oct 2022 08:00:36 +0100 Subject: [PATCH 054/159] Update database.php Although Postgres is not officially supported, it does seem to work ok, but to help a little bit with the Docker image, this is non-breaking change but allows the env file to specify the pgsql connection port --- config/database.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/database.php b/config/database.php index 9d94454db2..36440b2127 100755 --- a/config/database.php +++ b/config/database.php @@ -102,6 +102,7 @@ return [ 'pgsql' => [ 'driver' => 'pgsql', 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '5432'), 'database' => env('DB_DATABASE', 'forge'), 'username' => env('DB_USERNAME', 'forge'), 'password' => env('DB_PASSWORD', ''), From ccc7b78f623678ada9ef37a5ec34c45f76521b3c Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Mon, 30 Jan 2023 15:11:41 -0600 Subject: [PATCH 055/159] Store the acceptance dates with format YYY-mm-dd --- app/Http/Controllers/Account/AcceptanceController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 59c8f88430..726e164ba8 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -222,8 +222,8 @@ class AcceptanceController extends Controller 'item_model' => $display_model, 'item_serial' => $item->serial, 'eula' => $item->getEula(), - 'check_out_date' => Carbon::parse($acceptance->created_at)->format($branding_settings->date_display_format), - 'accepted_date' => Carbon::parse($acceptance->accepted_at)->format($branding_settings->date_display_format), + 'check_out_date' => Carbon::parse($acceptance->created_at)->format('Y-m-d'), + 'accepted_date' => Carbon::parse($acceptance->accepted_at)->format('Y-m-d'), 'assigned_to' => $assigned_to, 'company_name' => $branding_settings->site_name, 'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null, @@ -273,7 +273,7 @@ class AcceptanceController extends Controller 'item_tag' => $item->asset_tag, 'item_model' => $display_model, 'item_serial' => $item->serial, - 'declined_date' => Carbon::parse($acceptance->accepted_at)->format($branding_settings->date_display_format), + 'declined_date' => Carbon::parse($acceptance->declined_at)->format('Y-m-d'), 'assigned_to' => $assigned_to, 'company_name' => $branding_settings->site_name, 'date_settings' => $branding_settings->date_display_format, From 214a1af61a804ccda8f490e7fa53cf3efadceeee Mon Sep 17 00:00:00 2001 From: akemidx Date: Mon, 30 Jan 2023 16:54:23 -0500 Subject: [PATCH 056/159] apostrophe updates --- resources/views/hardware/checkin.blade.php | 2 +- resources/views/hardware/checkout.blade.php | 2 +- resources/views/hardware/quickscan-checkin.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php index 7f9087ae3d..f7fe067c8a 100755 --- a/resources/views/hardware/checkin.blade.php +++ b/resources/views/hardware/checkin.blade.php @@ -47,7 +47,7 @@ @else {{ trans('admin/hardware/general.model_invalid')}} - {{ trans(admin/hardware/general.model_invalid_fix')}} + {{ trans('admin/hardware/general.model_invalid_fix')}} @endif

diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index bdb03d3147..31dff70eaa 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -37,7 +37,7 @@ @else {{ trans('admin/hardware/general.model_invalid')}} - {{ trans(admin/hardware/general.model_invalid_fix')}} + {{ trans('admin/hardware/general.model_invalid_fix')}} @endif

diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php index 8884821809..677e0c0f15 100644 --- a/resources/views/hardware/quickscan-checkin.blade.php +++ b/resources/views/hardware/quickscan-checkin.blade.php @@ -86,7 +86,7 @@ - {{ trans(general.processing') }}... + {{ trans('general.processing') }}... From fc044528b89249efc4852fb8ec992bfa702b7f1c Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 30 Jan 2023 16:10:02 -0800 Subject: [PATCH 057/159] validation is working, success message appears, database is not updating --- app/Http/Livewire/SlackSettingsForm.php | 11 +- app/Models/Setting.php | 3 + .../livewire/slack-settings-form.blade.php | 138 ++++++++------ resources/views/settings/slack.blade.php | 175 +----------------- 4 files changed, 95 insertions(+), 232 deletions(-) diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php index 63b9383a93..ddc38f36b3 100644 --- a/app/Http/Livewire/SlackSettingsForm.php +++ b/app/Http/Livewire/SlackSettingsForm.php @@ -10,6 +10,7 @@ class SlackSettingsForm extends Component public $slack_endpoint; public $slack_channel; public $slack_botname; + public $successMessage; public Setting $setting; @@ -41,13 +42,17 @@ class SlackSettingsForm extends Component public function submit() { - dd("we here now"); - - $this->validate(); + $this->validate([ + 'slack_endpoint' => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable', + 'slack_channel' => 'required_with:slack_endpoint|starts_with:#|nullable', + 'slack_botname' => 'string|nullable', + ]); $this->setting->slack_endpoint = $this->slack_endpoint; $this->setting->slack_channel = $this->slack_channel; $this->setting->slack_botname = $this->slack_botname; + $this->successMessage= trans('admin/settings/message.update.success'); + } } diff --git a/app/Models/Setting.php b/app/Models/Setting.php index f2a4184178..8289260647 100755 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -83,6 +83,9 @@ class Setting extends Model 'email_domain', 'email_format', 'username_format', + 'slack_endpoint', + 'slack_channel', + 'slack_botname', ]; /** diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index a42a99fd7f..5d41ff2a6f 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -1,65 +1,85 @@
-
-
-
- {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }} -
-
- @if (config('app.lock_passwords')===true) - {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} -

{{ trans('general.feature_disabled') }}

- - @else - - {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} - @endif - {!! $errors->first('slack_endpoint', '') !!} -
-
+
+
+
+
+

+ {{ trans('admin/settings/general.slack') }} +

+
+
+
+ {{$successMessage}} + + {{csrf_field()}} +
+
+ {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }} +
+
+ @if (config('app.lock_passwords')===true) + {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} +

{{ trans('general.feature_disabled') }}

+ + @else + + {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} + @endif + {!! $errors->first('slack_endpoint', '') !!} +
+
- -
-
- {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }} -
-
- @if (config('app.lock_passwords')===true) - -

{{ trans('general.feature_disabled') }}

+ +
+
+ {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }} +
+
+ @if (config('app.lock_passwords')===true) + +

{{ trans('general.feature_disabled') }}

- @else - - @endif - {!! $errors->first('slack_channel', '') !!} -
-
- - -
-
- {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }} -
-
- @if (config('app.lock_passwords')===true) - {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }} - - -

{{ trans('general.feature_disabled') }}

- - @else - - @endif - {!! $errors->first('slack_botname', '') !!} -
-
-
-
- {{ trans('button.cancel') }} -
-
- + @else + + @endif + {!! $errors->first('slack_channel', '') !!} +
-
- + +
+
+ {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }} +
+
+ @if (config('app.lock_passwords')===true) + {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }} + +

{{ trans('general.feature_disabled') }}

+ + @else + + @endif + {!! $errors->first('slack_botname', '') !!} +
+
+
+
+ + {{ trans('button.cancel') }} + +
+
+ +
+
+ + +
+
+ +
+
+
+
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php index 67a3550536..9e0286c61b 100644 --- a/resources/views/settings/slack.blade.php +++ b/resources/views/settings/slack.blade.php @@ -20,189 +20,24 @@ } - - {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }} - {{csrf_field()}} - -
-
-
-
-

- {{ trans('admin/settings/general.slack') }} -

-
-
+

{!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!} - @if (($setting->slack_channel=='') && ($setting->slack_endpoint=='')) - {{ trans('admin/settings/general.slack_integration_help_button') }} - @endif -

+{{-- @if (($setting->slack_channel=='') && ($setting->slack_endpoint==''))--}} +{{-- {{ trans('admin/settings/general.slack_integration_help_button') }}--}} +{{-- @endif--}} +{{--

--}} -
@livewire('slack-settings-form') - -
-
- -
-
-
- - {{Form::close()}} - -@stop - -{{--@push('js')--}} -{{-- --}} - -{{--@endpush--}} From a7a578bf51462d52ef5fdf091ad3c114e3f8ba51 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Tue, 31 Jan 2023 00:13:44 -0600 Subject: [PATCH 058/159] Added head only logo to be used as default in apple-touch-icon --- public/img/snipe-logo-bug.png | Bin 0 -> 22482 bytes resources/views/layouts/default.blade.php | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 public/img/snipe-logo-bug.png diff --git a/public/img/snipe-logo-bug.png b/public/img/snipe-logo-bug.png new file mode 100644 index 0000000000000000000000000000000000000000..423a5b74906c4a1f67dab665a59a6731f0dbaa98 GIT binary patch literal 22482 zcmV*zKs>*RP)H{cw zH-Z76V6&ipv!U)TchtcW2+lsP_+<{^%8EQ%`R*@K-3_ zBFI98GDHaoIf0*S*mLLDMW{2ZU@fTkpm-I~EFvhS5D`%P2$9Vfy55&U`lD5tO+9y2 zgS<+iJ}Sr+2w{{05l{+{6TpuyXq_wXsz9U*_&b61AoYkc08rS<@)W{nHuP;wT*$g# zD(R0-VK(*L6$M!Z@>jqc1PLo}2221%3Mln|Htf0cf(+W1R`x~(ZUlL=QoKooI98pA zSZ@`A^dtP;hQ5vC7oy&mV)~;}m@loos}^B{z?*=DN-0AuL=h1{nIMB4K;)qpTi>Rh z-XMyrMR-5(Dy3A5AfQZLK|pL&gOq~*E3oaw*85UUe-sMyrIo$aBHSjh0YwiGR453* zTx^a^bDo-`aZrMwQcCy%yl_|ABD39~J_hnCpaQUz6H`&JmBvIEge?M_HuPyF6G1690|%aWeJgucA$$bnkeXsA4=k&e8C3PM$u&>zZGSatI8FkVE80z`t$iyYs(Q zfbLxBC8IE#R`v#gwMzIHO5G|V74}pX5waC|c4v3-`0>XXJ9`!pMN54t~)=d8;N^sPbhUWIyhI?YoJLgm4IqnNBFh z7eBFQ;{}iPyj0UmLSZ)b^foH^kO=P*=u&{QC~Ck=?JSQ@Ze{oJU8J-2L>8)ZRa9l- zcKBrkN;fIzk)$8KXUPaS!Z(Wwy%g#z3tFKDMckF=@hu3Ck} z1sZ{R5f%bh0X-!lpJ;~F%o+6!2TX%|O25eKMsI9K2ajee1 zoKuRgeqzs^iA_Dd)xdh-wF)bQZwK0}IuaErju(!zb8;6)4;*ojL`1L4)Qpb0`7FrI zM+#zkM^F&t+Z*~e-v1)|!az|0G$S-(B1Jcf%Mi5$WEp0#5G4vhTi6uWm|AfsfN>@2 zK|wyVp>N{_Rb+p<=n7+X&b3PTu)rNksS42=Eh4C}VyJS6EhCTc%!vbt*wb0*{bS$3 z%6Th^Qw1jY>=Jl#Q%~=!Ft-`prj)7|5lh8PH&~U!VdD@x&+g{<@G&x(w5L?hx}{am zbsg8jAdV>#C66L}`GxeumsZ}@CL&7|ED>0V&!ED9omwyXrySA;3&^ z4tDR|sVRt99cC+zjx>teP%Z7DHVdXf;BCIWC?JrF7dVzZ$}`!6?0b3-nM?*fu489( z_cV)BS5;*-J)s^#Nh=^|4(wM&jL&6Y$`MzKy91Id;#LE~vs-q;{=R zd|ZUvl%foAXOOdKR|&gi504&ul=11axZJ@t3$7BFpOsP=hQXEduOcvI=q|2xpJjr= zii!GZwhnIP;K%`HXJ?)Ayvb`8_3zut+i0f^3eJpv6vh3Z)^FhME_tv9g7#RJkSlZwlv}@4Kl72-w@$HHuP;g z^a6+JMWqX(FxC#VHc@QAobi@vP@uV^gVS zp*&W>GFfV_N^21`C5l`)&vGdr0+Iz@p3 zu~->v7OduqbPv(VFkS?dSzs56kBZQDsmxEQ^r98Ugl6?lLEfuGU4g;?b3l~^{en=a zQ0&d`sr^*onHbIHd;CgcmVhgsDHm0+fAQudQl4VrIo#_MEI0aa-(4F zLbE#+Gv)1B-pV`m& zl(#Q+(yW^|#|N?MGOwHYD=RCxwrVXhw^7R$|2p5Wkij#`^Zktj-MrC zWSLG(F*7@(wZ~Nyr4&o&cXM;Y&D2lTn(n(T6IK9D@kxZfm&)Si3sRU(J-uy8@hK7B ziOKq{-n3uL!O2An94|Y`FAx2k>FH^W^eInyW@q}pcc-{gu(ahe8VZf%BL&7}j3cq* z{PwX2w0xqKWy85yj$a{N8C-=81PsT%{$xv#L z?Yo~KyC>_&;Wer5cXoR!%PU#ey`I&HE0GDqxhx_D6nzN2nEQGzDXD#~^grK^r)+MXsj6WMPsM!^fDMonkJUWO!Z|K|jlH6bOLKS8|@T4GX%#T** z0!j*u&zs~&yZ?*HmoCasHV7t)ZcCo4H}l{r#%S&mH|W5>Sj6owQTm0>0^Lnf2)A)-szZ5hnE zy~qa;3;KeotNlJ<9E;P`&`8l0YeNb z>#KQEc5otjj6=H)dgM?R?Gh2KJhvTQMKwRWu_UvM#=2(Kx3A-}{AC!k8Y)9S@O^|Y zZ|J-8qOAX1$RscHF#e{V-etgdfmL=9xw0G&s?9vP|8Y+Y#U2>lWp-zxpTBqq|J+t3E#yjjhIx+T=O)pw`(ag;6 z{I094qsNOYv$4978yDTg zWiv}4=j53Nwg8{n(0Az`KXM_{i;BYt9Kk%e^%ncP`ba(H!E(lN6~>P$_N)Yo2Fjkj z<~6_9q?-&EHSE0pkl(me!IL33eIDFn$N{8Yg& z1WusTBq9kQ1uCVGlt9K_*nBCc7p*YXsl>Z6H%Fm>q4^_x>-XP4M+5Mqgm?y4zorka zA90EY+vO=b3H2(KADR4wR_hQAK|HJA;FH(8v1?wa0o4!^>RMqZ1RLnq1J`gNuCE|7w-sI!aP8eU1=WG#|+ z3-x$;dVmuu6f6^S>!l;A5;ZF#vnZw!nFgjet?Zo!P9U5FPANDcaN-Yj;QvJ<48W$I z-cH~@lv3;Mg|mC2KWESWU3g*Ns=Hqmgkn?Tv1!I z4#O}oFlcFNWo6gpR1qgK5hRj`5HG7DY=jBq4M^JMy2#}r+~97>L|H5H0#HCH6jBhO zV2Lt`a6-&eotU0AIj5D8IXDANOwiNeT1d zb&+ zjBV(9{s-_bq{6g;+J}<362-CLF}`=``;IL)8|1tz!BL7~T<00yt(5*U^!$JiLEKbK zUQ5+i$_$#amGY3J1QHd?BLcx-kc#q3V!;>z6+lwZ(|tK@HSNR;aYEw(j2U}Jp4f34 zS6Uw`x&7z$(y;G!Cqemj{GN?om$$>bM7Q{U*Q^$ASh3K@(x6`I35CLBv+h0-o$z|S4O@x)h)_&;{m}0YimM!6#Bl2< zj1FNH7q@kbwDwtQ?MsQ{vXEZzFZKbJ#tiNQuZ8@DPf-5w%}L#xAHy z0@$>&_iYGYLs2`^lHfn~{yS%QEi$$ z{w)`jP?mFXic)J--tvnPxAYp@v)y~HG_SdZ`OTd)l{eE_F`w$A6;N>d+c8na?JbBf zpiuh-xd(FtmnSNH!H=0J*n(0AM7XwmHcBuTKvxRy3_th!jT@5@?LPNjz0>rWYQOc? zQ*07S_qP{$ydGY$oO=B(D(IQ~16xXYy=D1hJbsdG%2nJ4dRc=*X9x$vH02vHJZs?M z{8iot6%=wpP(M}hfGF9u;T(@Jx!?!`uxVxQhYX7Wt>Qc)C+U9GGr;XzzOiMhD38-w+sVq>6)Z9q5f~D;99>fL!>m%OPeir=_W-+|&+`B;)=}AMgdc+X z>)3FFc)XICnVBNEhT>TU?hJO(&rcLx0_)u>spr?Pxq0;2-9Rx^RF8mw9IGP(oZw5oZ8W9-ZIf7AQ^(q_YgmxzphndZNSPeP zzwV?^j|=i2O7XY|hc3oG;fwuzn0tW_*T))eY>GECHa_Oz6?XD+5j&M8p2ePrI}mOj zuNm?VqSsWpgY13vmggOCfArUp*tw4Ly_Yw+oXO9HT+}n=ibSF`ls9nI{8g+7tR#5W zz@J3PEW#1YAM*O1AUiJhCajC9FdO(Zdv`byys^4ag<%*J3OZ7_o%(DC*-9yx z{_5W6_g?&_;oJw=yvZ+5@%|b6vmd=&@_g=tY`QXnTKVh;*>r^QD~Wx- z>n`gg)mzrN4zihLdCiBX1sYQ63gIW?whU(7c3ZrB&3m6~`hvj_^J?a?zI{E-$tKFP zWk^DtBE*m!1qOic13v=}DVY4kCEnI~@t<+0m{h`dTa1=Zh6n|dBpjG7b|LLS^P-A< zT}K^v;Pm_4*?KPiV&3OH$Yu|)pU&yL#FoRB`}rPZE1n$Yr<$r77St@@iq=)MPqiSE zmO?2(0#I2WqiIo`*5x(F7G7ER$%@*@=E(BZf3T-GTvXC)r%gS*YgCBu{xp5hlD#MP z;F3Bo5w%1@AAEPPN*`qF?C7AqwVk@^8e-uH@o1R`B4!gwre3BE}2=nBnShrsi*f9!&RgI^^Kihul3JBcc!~0 z3LqAX(b>^K&yp_Izic&^U$&IX+M01(N`><{FwkeYAJo8sMtO##Q>%gVxMw3Srz081!m?FJn+~qzI*Sz^gXkmL^9!& zVOQmvB7L)#*L~LOF8w_OgCQE?^{iXGp7z-`(=*D6=gvS-XzHrws@HVTzM_Uu*wC(m z^)Q=hW&V8NXD&7&4t)C4pT3yod(spC_SnS8?9k1p=1$Mc=j}(r3riO-=B>BCiogBv z2YBl(H_}>HOE?t7&=JG(Xv7MD7X?sk-9e9Q*eIqi@Zn*pqTO#8LM$9&#i9;wx#l`* zYN{C+8E0x{ntZU?wrczW#lTl#L=Wp|T=QFcSo2wpA4r zGh<0k>=-4Vhl<)L(TbqPnFLS~LDndxYV#v!4h9=r{Ri7GSh}PNv+bX@rqT=Z)x%T6 zFQ1v4ma?*P-gL+9eC99yoY&lN9j*1X+8}DkCz_H7?uhAuF?|pnM6%2SqCd>jNzTyf z<7}n!SePri7js4Ta%NIl4jnt{Wby))ZGzlF{BF3bJjI0BCivr%XE{D~oRjI3l(m#o z7p{erVE@bK3Jf2aV(9P`p=gNu_Hs95;PeqIl+c+UIrBuYvGt-nl<1P0B!Itv*Qc)i z#rAve?wsGWWW%4okITE}6AA`3CDCIYUU)W5hs|s$)&RWry=ZO5_ZNE*owAGGpp+t? zFYvV={F-n6@c%M$c1#Pxm0IW05vG_!oh#{F$Pk03`ev@}yp{!t`IKeLkgO%AfDsfH zuWjOrKWV3aemQ}F`(#m36cBk*!CRxtSD!j(g)cB&QiK8ME|>DICGD^N(A(eG($(68 zA>REUdh(bNzXEx@Bkwia6S8NXt0o$$w658TTD&L9-B%)paC!Ga=C^fnW@L;dT^J@G*WnI0vqs zP}-`j?lL;cQZ0N0s;kPav5;BjekRVEE=UYR?96bZl!IemB6gw zJQ*Tf7Nn!6j;rtJq@lAM!~Hdf4DfHj-$jf@DMvFtJqpC01a z$&*fAT~YMqf{EM|t*xz8C8|tQra%%xYYGg%001BWNklPTi2q*5uT{OOq~4h$V&JUT%pnx&?uhEO6%KBqYI%mibn=LpBb z)U?E`?vNf4jszQ9_r9RP^QDW9FzJ2U!zlg|;d9sz9a7rNw;s=AiKCejrFk}9o1qZ% zfR?Q@wnE_JGrol$4F|02nzDIJl4Td|>%~jhfMWmgem?TqUiKc?Poa?at#x@9Lz`-v zdC$^!6CE*s7AX`B5Q+rIWeeo91@gIqD^@_ELXcHi<}$OStFojjGaQ>b%AsQim`%-6 z5Jezh5Rb%JyXYDgWfl=jMlte2v@*oDQb?Nv7lfx#|whYQEqgHrbRh$(| zy4iE&7{jBZ)+K#&mRo)@lOz>M(NW$`FcTnB7GmAImT<+ZJE&_fCte>R6blgu85A-F zRH{HQA0$SM%2Wk4(^V`?ce1+rYSu2ghUJ|rs0r7QOXe6(jWAR(jH-g53J^#I89Xq> z>AjPLV*%pz(WYS7Xv~ccYz{WI`qw_5SGuSQlis&|35tJ4SZMVLo*A}ECzLPKp8bu|qc zy5mdfuIZ+kX3`TWB27`k@dz>r$*Bxy_D?W7nIYZ~TM(-VoeVX#KJ|hJ zl#6JRQv0^YL484xKL-_lc6bLABxkdP%Yp;~T9nk`E1G%1;--#i5{;*pC|_@*9(A)n z7s+C2SCJL6$+y=?X7dHU`n_MW>DynkeyK#S*1NGh8j13rtNuTlN1KoWEWf#h_3v6t zFl<;cA(L|z@{rFK$fk45j%OG?HcS7$vrG)kk(|zwP36g@O*80;Jq48c^PyR*c?e<% zl?@S=-`swptRnE5Re$-~7tCian!=>_ZNFW?-9WuPsCrZq(D;Hm3ip5Q8RlP6N7w3l zbIqj0;1-vmnK9))jm9x4Hp$V7aj1(t{rzQ6HF#!k&*1cb%cHFN#j7h0X@BgQ^6 z;_;uXvh?kr`WX1|1IKsLP|$myejPo`=tP3;K~)NV^xH@In=gExbULk-1zsfp!!Y=h zm9OTi#1%+hSg^W*SN_E^LQw<3zxIUl-d#Vk0-Ab+IIk!a6otGZF_~rf_$+6hIm__j zDbk5N=|ql9B1<8!5c5&6JAlss=l$sV3$8HfecKy>AE0=-O+r0;VZlWROYN0KWWRss zc1BOmI5VkpRXuCouz-g7{)IN57o?@46=I91Iu=Uv=1>{N-uYQJZ+#eNLfH4&CfNF1QBlsjy5B|9L?aRqu7BqeF2A(}F~lL}RuAFB zRJUz50T){~TwZ6TT&BRpP?GU8b4;9>WokIhiJhaz(sQ|5pn&2V2zP@zwxRFNXWhM5 zeAwm1CZ%4XV3o}q^jQL!Cc#5c0i{T%3Z~{;W}%Q*oY*nOgWufG+5V(6n;aL}CX#m9 z9uLgs8_LlOab!^1fBPPvvN#&$%PQ`y)-O5(D-a18eE4mzr@pSL}N}ql>OJCKO`p$PSW zxn!0ve(OK^*B^hMY&Pc<WE{`M~&Xjjlr zJd`>a3UUazC8Dipf2pT8`ibXw+{Xn)7=>C0YK(6#K7pO=H^*3W;N0JS5phFdNN8v_aSO2h0JoN-i%8 zamUR!Ft4GBA~e&EoY+u7IdF=VMd@CmJukFamECLB z`)1(f`u)$PEO3DpMv&JCR4ZpTX@n8bXQ*f+>UBbNWpX1onZ;h5 zb0AwcbsBn^+N5=~*d1pn0#^4ad*GGx>aY_VMKo?;fA7j|U9$%2@}={6`)giDYjX?X zkc$@fsRP?gDWyoKQ~d7O@0gx9N1>qD`@1uo+%w_uF}GQ6N0sC>&b)B1DP3WeE4L^r zfa}uxwpSDvbnbM)-0IZ6?PVzSEg&w~=wc0)J^d}FYksY32_$Cn9DH=hjB1K&mz}Z@ zR9-Q3Xo~SO3FaMajrq*Y#;yOB}0gatfuDxOzH(#-yMeR$O9-TuX0n*u&wcXQgya*&yDbCFG(^bESz)XOtp(HI! ztBFJvDg~^W&tQL_EiV(6~ zA)HrBNavi94*ga-JCNk?wqY{KoW~WmA7i1L;mM%{XZsUWHN}Y6M?D?rK^N<@?lsw= zeY5i%+(uV0=RHE9V9Iu6`xwt`8RVIVhp22Qqqe2Y)_=Etj~wRb`ucLZ=eM$^>k8@% zt;CHQf>j|##)r}Qj0hyM34&E2+N6#2L=GiF`?4C0pnWz;St8nAX0cgv_=?jeit=dW zyAsqR!N%5o=Q+&J?;zWa>#q+2#zR{kEfwr}g;FZ)cAnh=uXXSbrmaM|RNgwMkE<+2 zF1c&21`kZI`Crq#?9B^VbX7e8E41#3m)Jjefo7Jhx;^n0^9z(RUC?Yg&&=5jM|X^I zdiNN!XVat;IdYjiWz}IimRDI~S_5vsb4-Y6pM~9u`BEHkZ5^`t6sZ+l{dE#js+ZVM6`O(b&$>GB*~d9XHU;DF_>WZ z=nMk~Czu*aph`p}u6k`J*S&2aSOcM1T9;`mebc$#cGF%>ji%Z2;2Dl?A7v~z&C&ER z4ox0nU~Yinu_4OC<-Bj@`>36)rnr?m^|Eu>FO-{X=OAW;R#3GP?NM zFN*n*6|2wd^yKqBDtjBKPolWyhV|Ef;NdNgj#)A<6jY1Gx-{>?w_nzFV?DD&BcA4(F-E)leY?f8Gw-c)jX)zi%<^j5mSELgKPVb#y_~;a4r)C*HGsoOS znnKR!iD)xA77w#vRh=WGitZIz%vNv|JXiWpVA2>to$uNtnx)`k- zrN3o>BXft@HnokL%Wg)74R-$WG}phgi?VpAST510qIUjV#FUCvxok)k%hqP4kKmEG6C$^(a{`qe#zXNhflg+CRmq-D8X%n<1UZ zk4~&P82xumu@bt{A+k2 z3UlN7b!882d8G83g5p-gkd|mPN+=XElF8)t*=+Wkz*~VvpwNtJEV@W>E~2AF?&4YA6gCZ9$sJyuskSFw4H&!AXkgu({x%c^N!6zAZ!5e_~& z$l#$#!l%QIVr0{Kp8ol9=3ib*Lr1w6y5+w_jJ796j|T-X_W3lS_7hQg!0>Ez41ebr}+JM4p3PaVRj9*d4A_mKDXrg^ZHHWs1(D%S8 zW+yU^N0ge)^7xOBbMv1qB^D1_q}Cg0_JXr2>T3Una%X2Ctl&J86S%Wn*LH;ep-}fJ z;qZ;?uK)Un-t*2ozVibwYOf4$SRyJ_s=9-K)<%T z%~K`Vz6+V!EY^xI@^Y;Ag#t{Rnd4O7IA>4Im~kE5B3kCfnfY4zdaOdUG7(s?s*ZR= z#8C`;hO1)HHT2QiEZQ~EmENZB3d0bp8lqhNns(m&xz${C$9&?A)@E)coZ2}imnM{z$WXPt|T)liL<*}GmfV~~D#JM5Y(JY?HO8HexyRW#hrfv4$ zqdadN{3zviYIz-xTK}gMwhL}XeHBJPSbANv&r`$Y1D>Y3*OZ>OSW=(K(9JZ&>%v_B zwuRjC7t6Tph8AMgVe&b}{)Y!Sy?;t8OcgI5SUktB%WfOWML2y?Q;-VGrGn>7F2YzE z7cc@eG&E4(P)}oHBiUSzv585RbuHj8-tv0t%gdOWn4q(%o*S;Zl29<{c9IhO=ECFz zcH8U#lr<)9iA)mT+~=opE}ATwHlwW{vYtn|Wd(LGzMo zYUah9`yAP=|Dwcgi$;2}JT?BbPwxq{}U)ud*!Jn`eB zWKwxY30$v8i{@(mAj+{I=F*5=hdVLKfNIVoc}TAU!r?ICu=$vcKsbnz&pKr3>g7wh zdU>}?@bvW}&*L|A$kW|wFS_W^oX-|K&Xn6IH;>1I5wDUIeNb8+@frYq6OuErHBO<& zrh;LEo?BYY?UP!0U?~bVS<`B8Xo|*J^p3HS!66+gKuVQPLDf5efvRa=Ba~olYBNu^8!0 zn!2(mwN-I5heecZo>#n~Nk2wnwOof4sTe+?4_Ld5}zS_2O>e|a)#KX;N$5z}$Pw#dL|IRpX$U#>Tr?WhsrMp4H8mzFv z(rX%N?XKqJ?z7BIW{H$(4;pg3Cb49(Cxu&w-77k}Arb~v#(5;Cwx9mv7me9OqJ8h- zqsFfveVoDZ2?~V*Z(O&QNGODDTU0I&*{u0$$3)7@k$_kx#~xt!X#=iYR%3MZ@EuL{ z9z?^Psg8blwu)KpcPosrE!Dh2t1Got~-Fl@tv1J6Dba63^$AZM~F3Ry)qUGSI!GgAqP zwa#(QAZgRmvjAAK0J}St=e{B|0Alel3s*NIT(g&g_`saF9y3)8qVVfY!^pyzm zIS~_0@%1*@W}vRUoTi19uJS4GK{khvXlBOd56a%6sy9KTXuqw#9l;G~mX_PhZ;7f^ z?JQO3ZS>r0BX05JwelH)IBl~A{_)4Gtq=~ ze}8*tV^QeakHC88S#{V(!{kPGO;FhwWx*9Sp76eZ=6kmqIE^h@oY$8cyqrR7oij1C z>l#V+Z|`tDFkjvhX46(&r>Tww5XU^8Zwi8RDp;#8QYob%lZ9-~=_tK3eTEUG3J3vg zBIsSmPU;97we^G3|+Q7Aw(RzXrO45RLRmjUPK8+)p<^dR2+jSS&2t>d!{umsHA>=g@;R(LOK5@ zryNf+yej9-?oJA)COcG7YSvpyp>K@R3AIzOJ=r|O+;u=)GiK!%a)LUqBeOwZnHQ22 zWV48G3j2`xJO;~bgeoXb?wMf6FHSOeaFTpZF&&#_I66vWppp1=Ig-)uJJ*~p<|m>d zpN&<^D#N}b$2c`O%*`)bMNMS|APLN$B!12mR7!O_b4UqN zD3~TmA24NiopPS!#^P%cQNR536x!1(w$SFc+I>mZd%Gk9W<$>S4@>>sB8@Bp*N zrpXMYOPeRhr7vz+k@1ky*ZkgBbyJK;nM>duP0|p`P8P+$oD8m2(76dBUQ_K8+3$sU z<-}D)$7uN^@VWJ~xdLfrP}R^xUI`M3QP$8v8IVe)IP$Zfk;~;+v2Z@&pcQ&~wmsLr z6x3l;M^6V$&}NA(n4?49iVAtfSpOVP|Li2kcZ`us+s`WzpZQSK=js?|jHjP^id9#w zLMcTg5@tbnCu-?@GB3}Nm`;$L$@0WQPjLS|4^T5+P1$UefCP|&jf!4#;C7`ZZ%I?) zHC482Ja%f9{%59W?T)+N58Ajmb=m{24XoCe?ok@26TO5O)AYEmxhtWFRFE^k+e@9}=uE(F+w9pi&ukfD_x-0xOlQ0uVJnM`S_&Fx>o`#zVat{+y!ZX@ zBNz;N>W)MrgzLjdgRuFlzvDn+KMn1T#KJKq`zNU$jMGrrNJX%c=v>%&Zf!~TQ$t33 z96kI+yDu@BVf#JDiGQG*ctgaaG*%H_zULt`Iv253RW#($5n5AJG!(Lc&3y)rTX!Op z<;>_9qi4t2d*m3$N5`3*o#W7m*?Ri3NwVSe}OP?aFYF7hFE<^2S!LAXpKMk5Y4_|&svwfdlAMP z8P-jTUB07c0Hkv{b{#pvfuqNGe8*0Xo*CrK;1G!L51;%8Zhplp7#|iE$v#)rx*T24x%a$#3wtu?)rx+L*Ael_k+S-a?7%W`4kj~Cd zcJ125z)(K}oIym`J=;e}LNrt~ux!CHnsd#>Cn^aCLj(#z%Y^A1NNGwf9@+Al0(}ph zW`0jC^A^Xo(7I{2UDKwSC&%QvJ>c}Iy%SN>6+IemZ{J8~b0kwKW)n%aA3VyVPw!yc z6HhQXGe;tsWG>-9SsEnRv8{vP2nytWkpR=tB*unJim>aD+ekA1f%Y4m)}M z^%lojltyf*tw*#!>{4zhdKF6!&+ z866$v$?Z?lJZ~PWSFiSZX3F%;HvjH-oE;zM+7;b&b+kH?S*Vs$Fk2*Ki4;`GR)O1b z22vr00cB;7FQAln!?6RJHv3nKU`3Qb(4dghBBy{q46ZjAAeN2Ll5gSQ@IfBiwvDc? zE+P^ANe7Dh`g$fOC%N;^J85ieWN2uJGiT1Y@@RwRKV>j5IKZIwLlSj0byP;<#B-G_ zZduH{vKDHFs!aZH4on<5I?euvhgkKhHUgm%KQwL=JU?HukxMs!TF$9Nl5Kta*|~Qg zeFqM5YH*mrkrAe+rzw?eVy~yur%&_g&wQF6{?~soK7N*+J9qNYkAAd-jKa{+5Klb$ zBmrRc@@~q@Vy?ty+~@q`Frs)=31foP>!ET5WC{g#A3U7<)(`JVZQr}kNT!ly0QEJs z({H)$mhkItxgp%%(ri>Tlu_MW#^hjvLSBnCc+9hxPuQt#dLAc2C;9DfALOQ+Zemea zm#4AeaF|nS6?sP^Z7gn4jkm*!GnOJzP^#JuEnmY)6ix6_U-K3zn^8D9bA9q zN^9}h=AwYeSY-L?=X^E{K;Z8`@`0SdRls6>FcZlX-~Yw^g^zruH@ow|GiB2=v!O&X z#auGU*u+HS;q6ZuPwd*8>t3)xbuaHQn!2jZ=%^TE5?S(DS8;4p=Z&o5ki(!6;#B4| zpjdm&+9Dy#%ged{{`*N;Ka%ctoJ+txYco6>ky8{31(vT^!KXg=DHgBn;<9z!1X_Ze z-f^13OkT?g*<_yS(G-i;G!hIOxThm<&2v#Tu1u%qvILvksc2t7T}vAeZFz)8w{0bp zNm~yeP(G#Ch_8sn0(3L&h7$BP{^_5-lUKj`)gB%wB1}w7@YSz;mBic}fA!Ya(b7^g8T{MoO4)0ml?60R2u000+(Nkl0oO@mNZ zTgS&f_Sck^m6`l!Hp%1Pd7SJ}8r_XG-ztUzVVHO!{H*+b^ovL zzb zKIqtda<$hT6@-8?h)Fp^YKRj9C%L?5CGmLNf!0VQ!nN04%f!S4eSLit3I*qyJutS? zINKscw3+B~o%;HE{`#*!#-IM_I|&AZj17+Qi!c0=@yAE8kHI+TC#H9Zf{Fe)YFaC( zZj3s};#C}RmP`cOU4`uGIiW$U)BBoh8p$=<;(TF(=AqL^(G znwy&W`@jDrx7~Idfq?s)-AXBTJoPmHcK6-1)Yb5w*SwO3nrau7^-e>5KG@iLUU3)$ zAi82rzrZFS2arss3w;NVBrNl>19&izOymF($wVQMOeBE+0#0SJS>x2;Koom3jt!*- z#41B9xu${JKiQB_q{ zeD<@S{SO0hRpf@!&vhmK1y#4KOCm0O6C=Q$*8{_}|5*BfInhLOvYGqtzn?7+JxrnC_0X!Ss`&ipKhIab{1w)$Swk=w)R4xG z7}_0cDz0G|l$VwB?svb3yYK#Y-u{kv5R1i_n@#Y*|Nad_za2obwy$KDrEv(mO$z$= zjI;mYVUN`Uyl1n;8(L5Z!C-*aiZBz$4l*_}LO2}eO>cfP-~8scSaszp0s-%1$-F3{ zEq_=OBM=C3<&~@W=YRfZ-u>?P6!Dfqp}-G*@B?=4+{ulrE;orT7UvPSZPrj7L2=$c zDC&8jPoc4G4Ow|?|*GduS0udqzgdx3{+#VL!GRVdU(LGBC&0>=M*|9dhU z|NPxioNfY#_}L^^>j1l9nN*$=yT>`aZHTecbIgn+NlKbSl}DM1Pw;1d_I_@8<*h^_ zks{li%jMYm=vIF9t6y>8;4@52OfWMu>vTqSbu~?mO{`tJme>CO<(+$QT-ANYKfitJ zy_RIjvTRwFku6)oF>a(G#9#~^UZKQE4ISDfrKGR)pCo@~_#-n(GgGEzCNpV=rjyc| z&`b)H!2~jaqy#8+K*B(=1&W_Swq#3|^;o@jSG)V`ANO_c-IWlIO$hvEWZ%8_oO@p1 z^Lw4&Id|_~Hg4SL<~#n@37-G%^US_EZR=MCzzu~cXxS;&m(TWo<0_ikt9@yMrji+q z?mWpA3JgunQNOv9)oa$Es?5yHaNx-&Iq=j01_lN=ckUbu3u&AWzdMqnysV5hO-;16 zwz6;EKJLEzZep=mzis0p$i+;a@u4|J2BtXrt1(WW8E2sCDB0B+zVwAJaNF&lA!Ku+Am{+*=H?h3 z9p%D>3#eL~+SjaUV)g3PKEDn??=O1k` zb33)QwQhe{xr)J?=IO90V;W9 zS*E{l^YFRz-+ADnM{fA>Pk)wNNT)-08^laZ2 z6~XtdMyHR0gA(jKtAFjr0ED2BQ_l2Hkxwagi?zsNh*t;tc>7pC$z+m-#s)(6vi(wE zF)gUs*;xh-{hFum{|UoSoknL0K7Wwgb>jUBvIR?d_3jn&%J|R>jqOQlR>$#Hq{Wxl zjL0|rPazR%%Hrr;isPpSiIkO-C@XWhMmQWM8jZStru7q~LZQIBgYU9`|9*b@%rkuY z%5D7hop(^5tnt^|aHOiZ*5ez%{zyafioZI$?4gM1{@#cnJ%eY?es*|t?Do{`Tx&cQ zqp_|w*1mClBo=i-5|*Bs-eRR=#+fs(SpLsWX8HMp?{NC?xVsWHk(gqr>@=ZfVb^uL z*u8r(EtYke(>VVlS&;R1TdGf#kE{u+H=kM=k zPxlV0D=U2ck2x`1RU8m`2=uG*&Yl&mBf)zB#-Vh7UqX~5LJx2)unoAvu1`*clfY4h zVS)RBh}CI=;kYb`t0J*gP+ola7>A!b<2#XaNHg#;`Q@cJz$JP!i zD=RG^7L_D;v1YG%q{vd_)+tcAV31Zg8lva(t?azLg>WQP zI$dc6$5&o1pC`ST>1@hHISNFs3*&zm9(vMT5`}^8Z9s}JeMV(|SlBM^; zIQQOuX_OZq8elP#_dmD)osVajj7>1DDf00=$=VuXg(!suMP@?OWUDF5#6htR1KPEQ z`W7p&D0M!K=Iw6^r7S&RF=Ks82p}`NNG@xYyD**g{1w5)9Gj|Fm$BzBI%w%iQp(aY ztt5xjlseejq2bZ<3=EGEtEwSfUO^}pb8<5|HOb(qK~5e!N+FYG>&6zkw{`G|Et_2K zO%SLKw{sb!%hivA+#K)hK3TFNOVIm0c6C`27+2vnFQsTCYos?w~$Atm2e?MxDfUOQIzJ+I%G*GvUV4@uh}-^?u* zShPQXmtDw_&so=**&JF>@;PN{)cRmndTx=qNo$+K?DztU=^R6cCt16tnn*0{0>i4f zryH$wBU^LhYMNHpaei`|^OIA|PcJewVx8PouzT*KPcbu_G6MI;>NVm7j= z@;ah}D;-;hF2@J9{!*0(5Ung7Hek+JD3(`>7U1!3z0SzM6#f-rBi&Lah(QgTs@ZdI z2Mrr5Jd4RJ$@LHy%S@AvtK#m?bR215i9i%2WQiwN#}H3DawiJ@G4s1{)WDHB$!u|K zI50yZgd}98ag;H^&{cw*Feq0Q6>@^y8t?30(SoB%m;M7=a1hZUaT{!t`qVzVG2$+$ z84r+<(6nWh=e;!S7c>8IP)}4vxq4q4jcqnq0y-zotaJvJfMV+463gO}uqEEYkr0un z^%sqYi6+8CVqrIf=PAbcU4p6DN|N6~vqcC7@I;7&!$iVi!l4i$3E8_#>^>29L9;VCH= zPwwKNcz;b>lI*y-+1`xiz0+KrGo4ttzir;*dv4EsgWbFDa+ON#nd~iGiqST=OuOzu z5#+I6&@2`iY^Oa z5}n-z;CrZ~Ab@IFTKJ8k37bq zUmv9`5yx@oJB&n(_xStH=@V0Nc8Ydo7r+3bKVIpVOG?otHLLxk2L&Ei_>zc3JUzzn zf*KTz&5cBb`t{|+$|GdwbM_c|7Ka(M4p6=-#_oGMsBfvjb(@)70=)ml%jpGLInT}X ze(x$q9`~0iDK26o+hl5n{u6`z>|ig42CUroK1LD7dt6tG)8Zmukyn2a zNrB!M@9a7E9s{>5T{ghPJ9{S5NBaI1)$0*$^8vyf6Yxw}N7t~^RyUSYu_{h>E@up= z_pbw>NGwFxjqBKOr5C8}J~swO0syi&ixDyBLCvlhmft9#7dSvHb{njGBiqFE46h!3 zhgXlh!;zDN%+99)r9N517jC_g$_o30b)#&rk32BA%?Uaf@s(Ln zAZRb}fWiX;2~Q_5XN}iDkMmgRl8t3l)y0_{p7RZ+BUYSzEj#MidD}W`O-H@8BJWM! zOm+E^Yqr{8QQvHI-|wU~^%8HxntIi6XF525bl)jTCX*$d&2skq1%C1BA>KH8g2~hj z>1@`0$C|o2?!Ds{esAk$x8}jJeb%Pkciw5B0pNSe_CZ0v7w=m6n$c2pSpgI8>d9sL z`yLXw61Z0(R_wwu1%`hXCMqJ-w^VZa@C5#^KzL~yuc+qwd$tfOix^^E+%s1E9%Vy? zHtw5cnyb66hdCfFOXf4`<~Sv%QnQ>HJI{sb6o-$W;>ht+44)r29B~%lLZJ|CYuE6n zx8F>6SBKBc_9@5CZ`V}DH*s9CXy3OcmJEvUjd)kj0GEI+D_{WPo!#k7f8YIz)(f&1 z_jpfd?z?l<8yuq(8rzdd_%v#KDa}crY^>nwyEai#W5tSyG2^vpAOm`gNse9=cv|FL zF3#qAp3CJKIyc6VV<$O1cAnv}aYn{3Fp-*JF;~ip6{3+a-CH+v*G+rq*w|vfSIi`y zIPzJYB`fS?a8gbI--&m2|Hh)oq00^!fOu#3V5YzCuk1N;yCt4{+G1dEyk1zlrG`i} zL^hXq(+fhZJi;eG*UI{BNhD8w#{rH;02@ zizR|$YXtZv!XqUsagp?a00to5**%f&@B0cc1bPop>j#H1ipCgK)I>?Htzhg#%AGf% z5NzACmX1$1+NX3I`Adwxr^nd8d})^8BDNm1xVXsl%p7_9_}Q8Hc}|Uta%$up1E=2Q z-E*TXWctt0W*Y3EITdwJ$ZCz791=W+Bv>tPDvK7mIr z)iqR9(?x1hjv6`!HU5^up zRyyd(QviKF3zuvK)-=!6Izi#t|9zFA(esQ?r&!G8m|sY{dPh2wWo&Yaj1fXvOn%ec zxsFD{>}cP_=Wo20j@A~+;xT`{)G)&hZsE7bOw-x=?RzdV1bp*yfCaeptJN!|^pUKZ@k6X@d?sdkAnn#kk&oJ|Khv0K(eZ;lJ=Hn_T9Lf_6_R@heF^0BT!3s z5u-%qOMlwftyEgk=S1Z`;O*bUIkz1B)&K*LInozF*pBi?D%>PW7h-WepU+}=j;H?q zEwb}DZvEPJ)^DvgPG|}Yl4;tO0FN14i+Qg|DhVTF#wMm%FwEd0 zQ{1jgBpjx;x{3`=jdX6>$hM6wbZp!}EE@3-by59HQyLp2c5R*O0Mcy^ISBknm48Zf zb&p(%u~~|KtAKGR-QO1zXa%+dUj{x2np8`j4b7((dGX<6)UB`NlYg+DP{8SDNEiFtI(iz65rkPJ?I5RrN$usAeNTrybonN^4NvJWuMOvft+DK)6U zoW|ff?*|V6j;@0G?pgV4dnhPw)m>7_VJ#lMpsM>tS&Q$}bC#fYVpuJ}z*2sc_e<(576u12sMpwLZ>ez1CA~VPB2}ck03x%hyd>z0 z2rr}38}Ityfa1`H9xy@5^!Ju4k^m}2HKEWTBG;h02a)Zl)+)q+kY#0i?A*1L#n5wX zdOsW4>^n>3H@R5}R=AIEPj(iH76oDRI@5FkMaueOMzZsNYRNzSI-9y6o-E2 z0J9ur`gN@&6?beF>BXgu8$* z0&PI$dt{@?aw%c4SgA^dI0Wund9x^k2>*ua(;z2RNZWyCzf<&)28>DR{=Rz9eJFQ} zNDpYju~xkJScwTy_q72x0e1tt zaKltRrPy082si?lA^*+@0OnQoNfCJfc>BYqi(D*y>;MCh?(YqWWog|6{28zVbS;Rx zwpPmO2?`-oA+`Zi0G$xzCE$Kl-b!?RG=SpJ#}Y6mW%~OPz)pqF2wa2ZZLTf$0GHNR z98x%g>T?3mD)Q7v4JZzM>;dCYroT4^vQ}Z8Sfc7$tR;#D*ZT1p(x6CA;053r(1XB0 hytAkDao!&h`hQiyu`zZVw1EHs002ovPDHLkV1kB*5#ay; literal 0 HcmV?d00001 diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index daf4275481..ceabe13553 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -15,8 +15,8 @@ - - + + From cddae4869fcce2e4d2de3b313c5e929d4efac5ae Mon Sep 17 00:00:00 2001 From: lukasfehling <6AQmxBp2VWLzo3.LXH*ApJbbje8GYaqq> Date: Tue, 31 Jan 2023 18:27:25 +0100 Subject: [PATCH 059/159] fixed the endpoint for user notification with all their assigned assets --- app/Http/Controllers/Api/UsersController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index cca829c23f..9a9135a380 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -542,9 +542,10 @@ class UsersController extends Controller if (empty($user->email)) { return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.inventorynotification.error'))); } + + $user->notify((new CurrentInventory($user))); - return response()->Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success')); - + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success'))); } /** From 1e0c58c3cf77beb07c2e9e6624bf233dcd0466ab Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 31 Jan 2023 11:32:05 -0800 Subject: [PATCH 060/159] saves data correctly now --- app/Http/Livewire/SlackSettingsForm.php | 5 +- .../livewire/slack-settings-form.blade.php | 141 ++++++++---------- resources/views/settings/slack.blade.php | 28 +++- 3 files changed, 90 insertions(+), 84 deletions(-) diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php index ddc38f36b3..2cb153734c 100644 --- a/app/Http/Livewire/SlackSettingsForm.php +++ b/app/Http/Livewire/SlackSettingsForm.php @@ -52,7 +52,10 @@ class SlackSettingsForm extends Component $this->setting->slack_channel = $this->slack_channel; $this->setting->slack_botname = $this->slack_botname; - $this->successMessage= trans('admin/settings/message.update.success'); + $this->setting->save(); + + session()->flash('message',trans('admin/settings/message.update.success')); + } } diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index 5d41ff2a6f..b01ffa867f 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -1,85 +1,76 @@ -
-
-
-
-
-

- {{ trans('admin/settings/general.slack') }} -

-
-
-
- {{$successMessage}} -
- {{csrf_field()}} -
-
- {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }} -
-
- @if (config('app.lock_passwords')===true) - {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} -

{{ trans('general.feature_disabled') }}

- - @else - - {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} - @endif - {!! $errors->first('slack_endpoint', '') !!} -
-
- -
-
- {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }} -
-
- @if (config('app.lock_passwords')===true) - -

{{ trans('general.feature_disabled') }}

- @else - - @endif - {!! $errors->first('slack_channel', '') !!} -
+
+ @if (session()->has('message')) +
+ {{session('message')}} +
+ @endif + + {{csrf_field()}} + +
+
+ {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }}
- - -
-
- {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }} -
-
- @if (config('app.lock_passwords')===true) - {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }} - -

{{ trans('general.feature_disabled') }}

- - @else - - @endif - {!! $errors->first('slack_botname', '') !!} -
+
+ @if (config('app.lock_passwords')===true) +{{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} +

{{ trans('general.feature_disabled') }}

+
+ @else +
+{{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} + @endif + {!! $errors->first('slack_endpoint', '') !!}
-
-
+
- {{ trans('button.cancel') }} + +
+
+ {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }} +
+
+ @if (config('app.lock_passwords')===true) +
+

{{ trans('general.feature_disabled') }}

-
-
- -
-
+ @else +
+ @endif + {!! $errors->first('slack_channel', '') !!} +
+
+ + +
+
+ {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }} +
+
+ @if (config('app.lock_passwords')===true) +{{-- {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }}--}} +
+

{{ trans('general.feature_disabled') }}

+ + @else +
+ @endif + {!! $errors->first('slack_botname', '') !!} +
+
+ +
+
+ {{ trans('button.cancel') }} +
+
+ +
+
-
-
+
-
-
-
-
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php index 9e0286c61b..25480a1c1e 100644 --- a/resources/views/settings/slack.blade.php +++ b/resources/views/settings/slack.blade.php @@ -19,25 +19,37 @@ padding-right: 40px; } + {{csrf_field()}} - - +
+
+
+
+

+ {{ trans('admin/settings/general.slack') }} +

+
+

{!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!} +

-{{-- @if (($setting->slack_channel=='') && ($setting->slack_endpoint==''))--}} -{{-- {{ trans('admin/settings/general.slack_integration_help_button') }}--}} -{{-- @endif--}} -{{--

--}} + @livewire('slack-settings-form') + + + +
+
+ + +@stop - @livewire('slack-settings-form') - From a4173e38819a717e702a487d93112ce6c1e753e3 Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Tue, 31 Jan 2023 16:49:41 -0800 Subject: [PATCH 061/159] Permit not-delegated+dont-expire-password+normal-accounts to login --- app/Console/Commands/LdapSync.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php index c6f8dd379a..ea99e74d1f 100755 --- a/app/Console/Commands/LdapSync.php +++ b/app/Console/Commands/LdapSync.php @@ -303,17 +303,18 @@ class LdapSync extends Command $user->activated = 0; } */ $enabled_accounts = [ - '512', // 0x200 NORMAL_ACCOUNT - '544', // 0x220 NORMAL_ACCOUNT, PASSWD_NOTREQD - '66048', // 0x10200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD - '66080', // 0x10220 NORMAL_ACCOUNT, PASSWD_NOTREQD, DONT_EXPIRE_PASSWORD - '262656', // 0x40200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED - '262688', // 0x40220 NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED - '328192', // 0x50200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD - '328224', // 0x50220 NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD - '4194816',// 0x400200 NORMAL_ACCOUNT, DONT_REQ_PREAUTH + '512', // 0x200 NORMAL_ACCOUNT + '544', // 0x220 NORMAL_ACCOUNT, PASSWD_NOTREQD + '66048', // 0x10200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD + '66080', // 0x10220 NORMAL_ACCOUNT, PASSWD_NOTREQD, DONT_EXPIRE_PASSWORD + '262656', // 0x40200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED + '262688', // 0x40220 NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED + '328192', // 0x50200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD + '328224', // 0x50220 NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD + '4194816',// 0x400200 NORMAL_ACCOUNT, DONT_REQ_PREAUTH '4260352', // 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH '1049088', // 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED + '1114624', // 0x110200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, NOT_DELEGATED, ]; $user->activated = (in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts)) ? 1 : 0; From 02ca5248b10670728ef7f5874adea0c8c83b59cc Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Tue, 31 Jan 2023 17:44:09 -0800 Subject: [PATCH 062/159] Don't append username to the user's name if it's already there --- resources/views/partials/bootstrap-table.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 5a6e9dd464..d3a0fddc14 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -327,8 +327,8 @@ item_icon = ''; } - // display the username if it's checked out to a user - if (value.username) { + // display the username if it's checked out to a user, but don't do it if the username's there already + if (value.username && !value.name.match('\\(') && !value.name.match('\\)')) { value.name = value.name + ' (' + value.username + ')'; } From de1141491aa7441e7153f43e3cb73f0de18a9895 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 31 Jan 2023 19:41:42 -0800 Subject: [PATCH 063/159] Replaced help text Signed-off-by: snipe --- .../views/custom_fields/fieldsets/edit.blade.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/resources/views/custom_fields/fieldsets/edit.blade.php b/resources/views/custom_fields/fieldsets/edit.blade.php index a43769255d..7a35ca146f 100644 --- a/resources/views/custom_fields/fieldsets/edit.blade.php +++ b/resources/views/custom_fields/fieldsets/edit.blade.php @@ -1,13 +1,17 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/custom_fields/general.create_fieldset') , 'updateText' => trans('admin/custom_fields/general.update_fieldset'), + 'helpText' => trans('admin/custom_fields/general.about_fieldsets_text'), + 'helpPosition' => 'right', 'formAction' => (isset($item->id)) ? route('fieldsets.update', ['fieldset' => $item->id]) : route('fieldsets.store'), ]) -@section('inputFields') - - @include ('partials.forms.edit.name', ['translated_name' => trans('general.name')]) - - - +@section('content') + @parent @stop + +@section('inputFields') +@include ('partials.forms.edit.name', ['translated_name' => trans('general.name')]) +@stop + + From 3580bdae86cfcecd0a257d95be861fb3f709af11 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 1 Feb 2023 11:44:35 -0800 Subject: [PATCH 064/159] Use object accessor instead of array accessor --- app/Models/CheckoutAcceptance.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.php index d68ac7ab7c..4cdc5b073b 100644 --- a/app/Models/CheckoutAcceptance.php +++ b/app/Models/CheckoutAcceptance.php @@ -21,7 +21,7 @@ class CheckoutAcceptance extends Model { // At this point the endpoint is the same for everything. // In the future this may want to be adapted for individual notifications. - return Setting::getSettings()['alert_email']; + return Setting::getSettings()->alert_email; } /** From a45ce468cc8472f98d81fb78983830b064465d52 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 1 Feb 2023 11:44:56 -0800 Subject: [PATCH 065/159] Update return type for routing mail notifications --- app/Models/CheckoutAcceptance.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.php index 4cdc5b073b..45fc6ec088 100644 --- a/app/Models/CheckoutAcceptance.php +++ b/app/Models/CheckoutAcceptance.php @@ -16,8 +16,12 @@ class CheckoutAcceptance extends Model 'declined_at' => 'datetime', ]; - // Get the mail recipient from the config - public function routeNotificationForMail(): string + /** + * Get the mail recipient from the config + * + * @return mixed|string|null + */ + public function routeNotificationForMail() { // At this point the endpoint is the same for everything. // In the future this may want to be adapted for individual notifications. From f95a904d90f0523ff70ebb8076fc492152c5f64f Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 1 Feb 2023 12:08:13 -0800 Subject: [PATCH 066/159] adds integration button, working on its functionality --- .../Controllers/Api/SettingsController.php | 22 +++-------- app/Http/Controllers/SettingsController.php | 8 ++-- app/Http/Livewire/SlackSettingsForm.php | 19 +++------- app/Http/Requests/SlackSettingsRequest.php | 1 - .../livewire/slack-settings-form.blade.php | 37 ++++++++++++++++--- resources/views/settings/slack.blade.php | 5 --- 6 files changed, 47 insertions(+), 45 deletions(-) diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php index 62380b2212..26d380353f 100644 --- a/app/Http/Controllers/Api/SettingsController.php +++ b/app/Http/Controllers/Api/SettingsController.php @@ -143,21 +143,11 @@ class SettingsController extends Controller } - public function slacktest(SlackSettingsRequest $request) + public function slacktest($slack_endpoint,$slack_channel,$slack_botname) { - - $validator = Validator::make($request->all(), [ - 'slack_endpoint' => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable', - 'slack_channel' => 'required_with:slack_endpoint|starts_with:#|nullable', - ]); - - if ($validator->fails()) { - return response()->json(['message' => 'Validation failed', 'errors' => $validator->errors()], 422); - } - // If validation passes, continue to the curl request $slack = new Client([ - 'base_url' => e($request->input('slack_endpoint')), + 'base_url' => e($slack_endpoint), 'defaults' => [ 'exceptions' => false, ], @@ -165,18 +155,18 @@ class SettingsController extends Controller $payload = json_encode( [ - 'channel' => e($request->input('slack_channel')), + 'channel' => e($slack_channel), 'text' => trans('general.slack_test_msg'), - 'username' => e($request->input('slack_botname')), + 'username' => e($slack_botname), 'icon_emoji' => ':heart:', ]); try { - $slack->post($request->input('slack_endpoint'), ['body' => $payload]); + $slack->post($slack_endpoint, ['body' => $payload]); return response()->json(['message' => 'Success'], 200); } catch (\Exception $e) { - return response()->json(['message' => 'Please check the channel name and webhook endpoint URL ('.e($request->input('slack_endpoint')).'). Slack responded with: '.$e->getMessage()], 400); + return response()->json(['message' => 'Please check the channel name and webhook endpoint URL ('.e($slack_endpoint).'). Slack responded with: '.$e->getMessage()], 400); } //} diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 9a7c2cc7d5..6daaabdc9f 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -688,15 +688,15 @@ class SettingsController extends Controller * * @return View */ - public function postSlack(SlackSettingsRequest $request) + public function postSlack($slack_endpoint,$slack_channel,$slack_botname) { if (is_null($setting = Setting::getSettings())) { return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); } - $setting->slack_endpoint = $request->input('slack_endpoint'); - $setting->slack_channel = $request->input('slack_channel'); - $setting->slack_botname = $request->input('slack_botname'); + $setting->slack_endpoint = $slack_endpoint; + $setting->slack_channel = $slack_channel; + $setting->slack_botname = $slack_botname; if ($setting->save()) { return redirect()->route('settings.index') diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php index 2cb153734c..fbc54a0517 100644 --- a/app/Http/Livewire/SlackSettingsForm.php +++ b/app/Http/Livewire/SlackSettingsForm.php @@ -4,28 +4,16 @@ namespace App\Http\Livewire; use Livewire\Component; use App\Models\Setting; +use App\Http\Controllers\Api\SettingsController; class SlackSettingsForm extends Component { public $slack_endpoint; public $slack_channel; public $slack_botname; - public $successMessage; public Setting $setting; - protected $rules = [ - 'slack_endpoint' => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable', - 'slack_channel' => 'required_with:slack_endpoint|starts_with:#|nullable', - 'slack_botname' => 'string|nullable', - ]; - protected $messages = [ - 'slack_endpoint.required_with' => 'Slack endpoint is required', - 'slack_endpoint.starts_with' => 'Slack endpoint must start with https://hooks.slack.com', - - - ]; - public function mount(){ $this->setting = Setting::getSettings(); @@ -40,6 +28,11 @@ class SlackSettingsForm extends Component return view('livewire.slack-settings-form'); } + public function testSlack($slack_endpoint, $slack_channel, $slack_botname){ + SettingsController::testSlack($slack_endpoint,$slack_channel,$slack_botname); + + + } public function submit() { $this->validate([ diff --git a/app/Http/Requests/SlackSettingsRequest.php b/app/Http/Requests/SlackSettingsRequest.php index 1f44215198..e8f7d2f0ea 100644 --- a/app/Http/Requests/SlackSettingsRequest.php +++ b/app/Http/Requests/SlackSettingsRequest.php @@ -25,7 +25,6 @@ class SlackSettingsRequest extends Request 'slack_endpoint' => 'url|required_with:slack_channel|starts_with:"https://hooks.slack.com"|nullable', 'slack_channel' => 'required_with:slack_endpoint|starts_with:#|nullable', 'slack_botname' => 'string|nullable', - ]; } diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index b01ffa867f..6562f41b33 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -8,6 +8,7 @@ @endif
{{csrf_field()}} +
@@ -17,9 +18,9 @@ @if (config('app.lock_passwords')===true) {{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}}

{{ trans('general.feature_disabled') }}

-
+
@else -
+
{{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} @endif {!! $errors->first('slack_endpoint', '') !!} @@ -33,11 +34,11 @@
@if (config('app.lock_passwords')===true) -
+

{{ trans('general.feature_disabled') }}

@else -
+
@endif {!! $errors->first('slack_channel', '') !!}
@@ -51,16 +52,40 @@
@if (config('app.lock_passwords')===true) {{-- {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }}--}} -
+

{{ trans('general.feature_disabled') }}

@else -
+
@endif {!! $errors->first('slack_botname', '') !!}
+ + @if($slack_endpoint != null && $slack_channel != null && $slack_botname != null) +
+
+ {{ Form::label('test_slack', 'Test Slack') }} +
+
+ +
+ @if($response == 'success') + message here + @endif + @if($response == 'error') + message here + @endif +
+
+ @endif +{{--
--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{--
--}} +
{{ trans('button.cancel') }} diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php index 25480a1c1e..fffe4383c3 100644 --- a/resources/views/settings/slack.blade.php +++ b/resources/views/settings/slack.blade.php @@ -19,12 +19,10 @@ padding-right: 40px; } - {{csrf_field()}}
-

@@ -33,15 +31,12 @@

-

{!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!}

@livewire('slack-settings-form') - -
From a8643e5d35f1535bd28000bcbbaa44dc64b36a0a Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 1 Feb 2023 15:55:16 -0500 Subject: [PATCH 067/159] cleaning up/adding variable --- resources/lang/en/admin/components/general.php | 2 +- resources/views/components/checkin.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/en/admin/components/general.php b/resources/lang/en/admin/components/general.php index 5d93036054..5b788a51ec 100644 --- a/resources/lang/en/admin/components/general.php +++ b/resources/lang/en/admin/components/general.php @@ -12,5 +12,5 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Component', - 'checkin_limit' => 'Amount checked in must be equal to or less than this amount' + 'checkin_limit' => 'Amount checked in must be equal to or less than :assigned_qty' ); diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php index 55822fb9cf..0bbc46eff1 100644 --- a/resources/views/components/checkin.blade.php +++ b/resources/views/components/checkin.blade.php @@ -42,7 +42,7 @@
-

{{ trans(admin/components/general.checkin_limit) }}: {{ $component_assets->assigned_qty }}

+

{{ trans(admin/components/general.checkin_limit, ['assigned_qty' => '$component_assets->assigned_qty']) }}

{!! $errors->first('checkin_qty', '') !!}
From 4e5b8fa2136b79f398bca387f6b37740e482e17f Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 1 Feb 2023 16:05:50 -0500 Subject: [PATCH 068/159] fixing pr --- app/Http/Controllers/Api/UsersController.php | 1 - app/Http/Controllers/Users/UsersController.php | 1 - app/Models/User.php | 1 - app/Presenters/UserPresenter.php | 9 --------- resources/lang/en/admin/users/general.php | 3 --- resources/views/users/edit.blade.php | 13 ------------- 6 files changed, 28 deletions(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 8185583868..cca829c23f 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -246,7 +246,6 @@ class UsersController extends Controller 'two_factor_optin', 'two_factor_enrolled', 'remote', - 'vipuser', 'start_date', 'end_date', ]; diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 9d322ca4d9..52d423036f 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -271,7 +271,6 @@ class UsersController extends Controller $user->activated = $request->input('activated', 0); $user->zip = $request->input('zip', null); $user->remote = $request->input('remote', 0); - $user->vipuser = $request->input('vipuser', 0); $user->website = $request->input('website', null); $user->start_date = $request->input('start_date', null); $user->end_date = $request->input('end_date', null); diff --git a/app/Models/User.php b/app/Models/User.php index b51d23626f..87a0ef0916 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -62,7 +62,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo 'start_date', 'end_date', 'scim_externalid', - 'vipuser', ]; protected $casts = [ diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index dc41050f5b..8f5cfcccf5 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -85,15 +85,6 @@ class UserPresenter extends Presenter 'visible' => true, 'formatter' => 'usersLinkFormatter', ], - [ - 'field' => 'vipuser', - 'searchable' => false, - 'sortable' => true, - 'switchable' => true, - 'title' => trans('admin/users/general.vip_label'), - 'visible' => false, - 'formatter' => 'trueFalseFormatter', - ], [ 'field' => 'remote', 'searchable' => false, diff --git a/resources/lang/en/admin/users/general.php b/resources/lang/en/admin/users/general.php index 241667c387..8d890d6c08 100644 --- a/resources/lang/en/admin/users/general.php +++ b/resources/lang/en/admin/users/general.php @@ -41,6 +41,3 @@ return [ 'remote' => 'Remote', 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.', 'not_remote_label' => 'This is not a remote user', - 'vip_label' => 'VIP user', - 'vip_help' => 'This can be helpful to mark important people if you would like', -]; diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index b06dcad237..93b8fb7a21 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -362,19 +362,6 @@ @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.end_date'), 'fieldname' => 'end_date', 'item' => $user]) - -
-
- -

{{ trans('admin/users/general.vip_help') }} -

-
-
-
From 4d9d73483fc35a299c766aa53c7d2b781a3b6e69 Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 1 Feb 2023 16:09:19 -0500 Subject: [PATCH 069/159] fixing pr --- .../2023_01_23_232933_add_vip_to_users.php | 34 ------------------- resources/views/users/view.blade.php | 10 ------ 2 files changed, 44 deletions(-) delete mode 100644 database/migrations/2023_01_23_232933_add_vip_to_users.php diff --git a/database/migrations/2023_01_23_232933_add_vip_to_users.php b/database/migrations/2023_01_23_232933_add_vip_to_users.php deleted file mode 100644 index 40db001b17..0000000000 --- a/database/migrations/2023_01_23_232933_add_vip_to_users.php +++ /dev/null @@ -1,34 +0,0 @@ -boolean('vipuser')->nullable()->default(0); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('users', function (Blueprint $table) { - if (Schema::hasColumn('users', 'vipuser')) { - $table->dropColumn('vipuser'); - } - }); - } -} diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index f12929a9d4..725a97ebe7 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -518,16 +518,6 @@
@endif - - -
-
- {{ trans('admin/users/general.vip_label') }} -
-
- {!! ($user->vipuser=='1') ? ' '.trans('general.yes') : ' '.trans('general.no') !!} -
-
From 3702dd87ce25a202be53ba090500a0dc0c8d4e0e Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 1 Feb 2023 16:10:30 -0500 Subject: [PATCH 070/159] fixing pr --- resources/lang/en/admin/users/general.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/admin/users/general.php b/resources/lang/en/admin/users/general.php index 8d890d6c08..ff482b8ebb 100644 --- a/resources/lang/en/admin/users/general.php +++ b/resources/lang/en/admin/users/general.php @@ -41,3 +41,4 @@ return [ 'remote' => 'Remote', 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.', 'not_remote_label' => 'This is not a remote user', +]; \ No newline at end of file From 90c1bfe03df1278c4ae6b03eb6bf76e78590207e Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 1 Feb 2023 16:12:39 -0500 Subject: [PATCH 071/159] fixing pr --- app/Models/User.php | 1 - resources/views/users/view.blade.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index 87a0ef0916..1b336503c8 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -69,7 +69,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo 'manager_id' => 'integer', 'location_id' => 'integer', 'company_id' => 'integer', - 'vipuser' => 'boolean', ]; diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 725a97ebe7..75be81a886 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -518,7 +518,7 @@
@endif - +
From 33d819fd41df9b8a3bbaa274549db4db1f34976b Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 1 Feb 2023 16:13:53 -0500 Subject: [PATCH 072/159] fixing pr --- resources/views/users/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 75be81a886..5d959589e6 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -519,7 +519,7 @@
@endif - +
{{ trans('admin/users/general.remote') }} From 0ffd40a2170a51feea442a8eac3e0f3f4a4473da Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 1 Feb 2023 16:30:07 -0500 Subject: [PATCH 073/159] fixing syntax --- resources/views/components/checkin.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php index 0bbc46eff1..6a7055f727 100644 --- a/resources/views/components/checkin.blade.php +++ b/resources/views/components/checkin.blade.php @@ -42,7 +42,7 @@
-

{{ trans(admin/components/general.checkin_limit, ['assigned_qty' => '$component_assets->assigned_qty']) }}

+

{{ trans('admin/components/general.checkin_limit', ['assigned_qty' => $component_assets->assigned_qty]) }}

{!! $errors->first('checkin_qty', '') !!}
From 67e6089805099b6c86249a2a246fc483af562bc8 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 1 Feb 2023 16:36:30 -0800 Subject: [PATCH 074/159] Short circuit the LDAP sync is LDAP is disabled Signed-off-by: snipe --- app/Console/Commands/LdapSync.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php index ea99e74d1f..f7b7518316 100755 --- a/app/Console/Commands/LdapSync.php +++ b/app/Console/Commands/LdapSync.php @@ -44,12 +44,17 @@ class LdapSync extends Command */ public function handle() { + + // If LDAP enabled isn't set to 1 (ldap_enabled!=1) then we should cut this short immediately without going any further + if (Setting::getSettings()->ldap_enabled!='1') { + $this->error('LDAP is not enabled. Aborting. See Settings > LDAP to enable it.'); + } + ini_set('max_execution_time', env('LDAP_TIME_LIM', 600)); //600 seconds = 10 minutes ini_set('memory_limit', env('LDAP_MEM_LIM', '500M')); $ldap_result_username = Setting::getSettings()->ldap_username_field; $ldap_result_last_name = Setting::getSettings()->ldap_lname_field; $ldap_result_first_name = Setting::getSettings()->ldap_fname_field; - $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag; $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num; $ldap_result_email = Setting::getSettings()->ldap_email; From 0cfeab8c508650586ea2ad1bdece7de8fa98dd84 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 1 Feb 2023 16:46:58 -0800 Subject: [PATCH 075/159] Added an exit for the LDAP disabled sync short-circuit Signed-off-by: snipe --- app/Console/Commands/LdapSync.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php index f7b7518316..c2d7446934 100755 --- a/app/Console/Commands/LdapSync.php +++ b/app/Console/Commands/LdapSync.php @@ -48,6 +48,7 @@ class LdapSync extends Command // If LDAP enabled isn't set to 1 (ldap_enabled!=1) then we should cut this short immediately without going any further if (Setting::getSettings()->ldap_enabled!='1') { $this->error('LDAP is not enabled. Aborting. See Settings > LDAP to enable it.'); + exit(); } ini_set('max_execution_time', env('LDAP_TIME_LIM', 600)); //600 seconds = 10 minutes From 3a86547ef55831af2a6a7a52bbd440b64246e623 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 1 Feb 2023 16:51:05 -0800 Subject: [PATCH 076/159] fixes messages for integration test, removes slack request file, rehouses ajax method --- .../Controllers/Api/SettingsController.php | 31 ------------ app/Http/Livewire/SlackSettingsForm.php | 35 ++++++++++++-- app/Http/Requests/SlackSettingsRequest.php | 32 ------------- .../livewire/slack-settings-form.blade.php | 47 ++++++++++--------- 4 files changed, 56 insertions(+), 89 deletions(-) delete mode 100644 app/Http/Requests/SlackSettingsRequest.php diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php index 26d380353f..d0f7fea602 100644 --- a/app/Http/Controllers/Api/SettingsController.php +++ b/app/Http/Controllers/Api/SettingsController.php @@ -143,37 +143,6 @@ class SettingsController extends Controller } - public function slacktest($slack_endpoint,$slack_channel,$slack_botname) - { - // If validation passes, continue to the curl request - $slack = new Client([ - 'base_url' => e($slack_endpoint), - 'defaults' => [ - 'exceptions' => false, - ], - ]); - - $payload = json_encode( - [ - 'channel' => e($slack_channel), - 'text' => trans('general.slack_test_msg'), - 'username' => e($slack_botname), - 'icon_emoji' => ':heart:', - ]); - - try { - $slack->post($slack_endpoint, ['body' => $payload]); - return response()->json(['message' => 'Success'], 200); - - } catch (\Exception $e) { - return response()->json(['message' => 'Please check the channel name and webhook endpoint URL ('.e($slack_endpoint).'). Slack responded with: '.$e->getMessage()], 400); - } - - //} - return response()->json(['message' => 'Something went wrong :( '], 400); - } - - /** * Test the email configuration * diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php index fbc54a0517..9e83087112 100644 --- a/app/Http/Livewire/SlackSettingsForm.php +++ b/app/Http/Livewire/SlackSettingsForm.php @@ -2,9 +2,9 @@ namespace App\Http\Livewire; +use GuzzleHttp\Client; use Livewire\Component; use App\Models\Setting; -use App\Http\Controllers\Api\SettingsController; class SlackSettingsForm extends Component { @@ -28,8 +28,35 @@ class SlackSettingsForm extends Component return view('livewire.slack-settings-form'); } - public function testSlack($slack_endpoint, $slack_channel, $slack_botname){ - SettingsController::testSlack($slack_endpoint,$slack_channel,$slack_botname); + public function testSlack(){ + + // If validation passes, continue to the curl request + $slack = new Client([ + 'base_url' => e($this->slack_endpoint), + 'defaults' => [ + 'exceptions' => false, + ], + ]); + + $payload = json_encode( + [ + 'channel' => e($this->slack_channel), + 'text' => trans('general.slack_test_msg'), + 'username' => e($this->slack_botname), + 'icon_emoji' => ':heart:', + ]); + + try { + $slack->post($this->slack_endpoint, ['body' => $payload]); + return session()->flash('success' , 'Your Slack Integration works!'); + + } catch (\Exception $e) { + return session()->flash('error' , 'Please check the channel name and webhook endpoint URL ('.e($this->slack_endpoint).'). Slack responded with: '.$e->getMessage()); + } + + //} + return session()->flash('message' , 'Something went wrong :( '); + } @@ -47,7 +74,7 @@ class SlackSettingsForm extends Component $this->setting->save(); - session()->flash('message',trans('admin/settings/message.update.success')); + session()->flash('save',trans('admin/settings/message.update.success')); } diff --git a/app/Http/Requests/SlackSettingsRequest.php b/app/Http/Requests/SlackSettingsRequest.php deleted file mode 100644 index e8f7d2f0ea..0000000000 --- a/app/Http/Requests/SlackSettingsRequest.php +++ /dev/null @@ -1,32 +0,0 @@ - 'url|required_with:slack_channel|starts_with:"https://hooks.slack.com"|nullable', - 'slack_channel' => 'required_with:slack_endpoint|starts_with:#|nullable', - 'slack_botname' => 'string|nullable', - ]; - } - - -} diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index 6562f41b33..0335b6d0cc 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -1,11 +1,26 @@
- @if (session()->has('message')) + @if (session()->has('save'))
- {{session('message')}} + {{session('save')}}
@endif + @if(session()->has('success')) +
+ {{session('success')}} +
+ @endif + @if(session()->has('error')) +
+ {{session('error')}} +
+ @endif + @if(session()->has('message')) +
+ {{session('message')}} +
+ @endif {{csrf_field()}} @@ -34,11 +49,11 @@
@if (config('app.lock_passwords')===true) -
+

{{ trans('general.feature_disabled') }}

@else -
+
@endif {!! $errors->first('slack_channel', '') !!}
@@ -64,33 +79,21 @@ @if($slack_endpoint != null && $slack_channel != null && $slack_botname != null) -
+
{{ Form::label('test_slack', 'Test Slack') }}
- + {!! trans('admin/settings/general.slack_test') !!}
- @if($response == 'success') - message here - @endif - @if($response == 'error') - message here - @endif
-
+
@endif -{{--
--}} -{{-- --}} -{{-- --}} -{{-- --}} -{{--
--}} -
-
+
+ +
{{ trans('button.cancel') }} -
-
From 17f1772143bbe86113e169746ea1dcc2719be023 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 1 Feb 2023 16:58:08 -0800 Subject: [PATCH 077/159] removes postslack from settings controller --- app/Http/Controllers/SettingsController.php | 27 --------------------- 1 file changed, 27 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 6daaabdc9f..7e01ff3fa1 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -679,33 +679,6 @@ class SettingsController extends Controller return view('settings.slack', compact('setting')); } - /** - * Return a form to allow a super admin to update settings. - * - * @author [A. Gianotto] [] - * - * @since [v1.0] - * - * @return View - */ - public function postSlack($slack_endpoint,$slack_channel,$slack_botname) - { - if (is_null($setting = Setting::getSettings())) { - return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); - } - - $setting->slack_endpoint = $slack_endpoint; - $setting->slack_channel = $slack_channel; - $setting->slack_botname = $slack_botname; - - if ($setting->save()) { - return redirect()->route('settings.index') - ->with('success', trans('admin/settings/message.update.success')); - } - - return redirect()->back()->withInput()->withErrors($setting->getErrors()); - } - /** * Return a form to allow a super admin to update settings. * From 039d159cbdc0d0ef7fb3591020699eeb8eeda99e Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Wed, 1 Feb 2023 16:43:09 -0800 Subject: [PATCH 078/159] WIP: working on better Rollbar filtering in prod --- config/logging.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/logging.php b/config/logging.php index cdd0bbcbdf..1e3e3b4932 100644 --- a/config/logging.php +++ b/config/logging.php @@ -113,6 +113,13 @@ $config = [ 'handler' => \Rollbar\Laravel\MonologHandler::class, 'access_token' => env('ROLLBAR_TOKEN'), 'level' => env('ROLLBAR_LEVEL', 'error'), + 'check_ignore' => function($isUncaught, $args, $payload) { + if (method_exists($args, 'getMessage') && strstr($args->getMessage(), 'Declaration of')) { + return true; + } + + return false; + }, ], ], From 69c38bf686f756968d2a4a25a4c2005a2152d4c2 Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 1 Feb 2023 20:32:16 -0500 Subject: [PATCH 079/159] translations on the User Creation page --- resources/lang/en/admin/users/general.php | 5 +++++ resources/views/setup/user.blade.php | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/resources/lang/en/admin/users/general.php b/resources/lang/en/admin/users/general.php index daa568e8bf..e845ed09b7 100644 --- a/resources/lang/en/admin/users/general.php +++ b/resources/lang/en/admin/users/general.php @@ -41,4 +41,9 @@ return [ 'remote' => 'Remote', 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.', 'not_remote_label' => 'This is not a remote user', + 'create_user' => 'Create a user', + 'create_user_page_explaination' => 'This is the account information you will use to access the site for the first time.', + 'email_credentials' => 'Email credentials', + 'email_credentials_text' => 'Email my credentials to the email address above', + 'next_save_user' => 'Next: Save User', ]; diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php index eaa74fb857..b6ff3293dc 100644 --- a/resources/views/setup/user.blade.php +++ b/resources/views/setup/user.blade.php @@ -1,15 +1,14 @@ @extends('layouts/setup') -{{-- TODO: Translate --}} -{{-- Page title --}} +{{ trans('admin/user/table.createuser') }} @section('title') -Create a User :: +{{ trans('admin/user/general.create_user') }} :: @parent @stop {{-- Page content --}} @section('content') -

This is the account information you'll use to access the site for the first time.

+

{{ trans('admin/user/general.create_user_page_explaination') }}

{{ csrf_field() }} @@ -157,10 +156,10 @@ Create a User ::
- +
@@ -168,7 +167,7 @@ Create a User :: @stop @section('button') - + @parent @stop From 78dca7fd325c8bed622f362ce47fa18970d978e4 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 2 Feb 2023 10:49:36 -0800 Subject: [PATCH 080/159] Handle missing userfiles more gracefully Signed-off-by: snipe --- resources/lang/en/general.php | 3 ++- resources/views/users/view.blade.php | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 43d8b3d9e1..66872bd1bf 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -390,7 +390,8 @@ return [ 'start_date' => 'Start Date', 'end_date' => 'End Date', 'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail', - 'placeholder_kit' => 'Select a kit' + 'placeholder_kit' => 'Select a kit', + 'file_not_found' => 'File not found', diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 5d959589e6..c4f6eca878 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -869,16 +869,19 @@ @if ($file->filename) - @if ( Helper::checkUploadIsImage($file->get_src('users'))) + @if ((Storage::exists('private_uploads/users/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('users')))) + @else + + {{ trans('general.file_not_found') }} @endif @endif {{ $file->filename }} - - {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/users/'.$file->filename)) }} + + {{ (Storage::exists('private_uploads/users/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/users/'.$file->filename)) : '' }} @@ -888,10 +891,12 @@ @if ($file->filename) - - - {{ trans('general.download') }} - + @if ((Storage::exists('private_uploads/users/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('users')))) + + + {{ trans('general.download') }} + + @endif @endif {{ $file->created_at }} From 7344bbdd7f794fc86187a890c8f9a9f04af1f976 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 2 Feb 2023 11:26:33 -0800 Subject: [PATCH 081/159] Added checkout/checkin note to user history Signed-off-by: snipe --- resources/views/users/view.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index c4f6eca878..3fb3b9a58c 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -954,7 +954,8 @@ @endif {{ trans('admin/hardware/table.serial') }} {{ trans('general.item') }} - {{ trans('general.target') }} + {{ trans('general.notes') }} + {{ trans('general.target') }} From 37ce68af5bfeb7a17f171a732dabe5c756e26237 Mon Sep 17 00:00:00 2001 From: akemidx Date: Thu, 2 Feb 2023 15:54:05 -0500 Subject: [PATCH 082/159] once again fixing an apostrophe --- resources/views/hardware/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index a710bc815a..b4cd6d4988 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -85,7 +85,7 @@
- {{ trans('general.'notification_warning') }} + {{ trans('general.notification_warning') }} {{ trans('general.asset_deleted_warning') }}
From 51f3857a31353b676a67ced378ea4af099515aa9 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 2 Feb 2023 15:32:45 -0800 Subject: [PATCH 083/159] Fixed something I think I broke Signed-off-by: snipe --- app/Http/Controllers/CustomFieldsetsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php index bee0f38e27..8128b3369f 100644 --- a/app/Http/Controllers/CustomFieldsetsController.php +++ b/app/Http/Controllers/CustomFieldsetsController.php @@ -196,7 +196,7 @@ class CustomFieldsetsController extends Controller */ public function associate(Request $request, $id) { - $set = CustomField::find($id); + $set = CustomFieldset::find($id); $this->authorize('update', $set); From dc414d35528da6158be97282adca281d69783f2c Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 2 Feb 2023 23:38:59 -0800 Subject: [PATCH 084/159] Updated model restore route Signed-off-by: snipe --- resources/views/models/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php index 3b9078d29c..8bce7365fd 100755 --- a/resources/views/models/view.blade.php +++ b/resources/views/models/view.blade.php @@ -305,7 +305,7 @@ @if ($model->deleted_at!='') -

  • {{ trans('admin/models/general.restore') }}
    • +

  • {{ trans('admin/models/general.restore') }}
    • @endif From 74c64c1fc5a39df8d21a1c460b1533528cddb114 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 6 Feb 2023 09:40:57 -0800 Subject: [PATCH 085/159] adds validation to the update hook, removes typos and deadlines --- app/Http/Livewire/SlackSettingsForm.php | 17 +++++++++++------ .../livewire/slack-settings-form.blade.php | 11 ++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php index 9e83087112..8e3e148f3d 100644 --- a/app/Http/Livewire/SlackSettingsForm.php +++ b/app/Http/Livewire/SlackSettingsForm.php @@ -14,6 +14,12 @@ class SlackSettingsForm extends Component public Setting $setting; + protected $rules = [ + 'slack_endpoint' => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable', + 'slack_channel' => 'required_with:slack_endpoint|starts_with:#|nullable', + 'slack_botname' => 'string|nullable', + ]; + public function mount(){ $this->setting = Setting::getSettings(); @@ -22,6 +28,10 @@ class SlackSettingsForm extends Component $this->slack_botname = $this->setting->slack_botname; } + public function updated($field){ + + $this->validateOnly($field ,$this->rules); + } public function render() { @@ -30,7 +40,6 @@ class SlackSettingsForm extends Component public function testSlack(){ - // If validation passes, continue to the curl request $slack = new Client([ 'base_url' => e($this->slack_endpoint), 'defaults' => [ @@ -62,11 +71,7 @@ class SlackSettingsForm extends Component } public function submit() { - $this->validate([ - 'slack_endpoint' => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable', - 'slack_channel' => 'required_with:slack_endpoint|starts_with:#|nullable', - 'slack_botname' => 'string|nullable', - ]); + $this->validate($this->rules); $this->setting->slack_endpoint = $this->slack_endpoint; $this->setting->slack_channel = $this->slack_channel; diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index 0335b6d0cc..c165118cbd 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -31,12 +31,10 @@
    @if (config('app.lock_passwords')===true) -{{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}}

    {{ trans('general.feature_disabled') }}

    -
    +
    @else -
    -{{-- {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}--}} +
    @endif {!! $errors->first('slack_endpoint', '') !!}
    @@ -66,12 +64,11 @@
    @if (config('app.lock_passwords')===true) -{{-- {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }}--}} -
    +

    {{ trans('general.feature_disabled') }}

    @else -
    +
    @endif {!! $errors->first('slack_botname', '') !!}
    From 686d1aaae73af8b7e5bf161ff347b032bfa3ad78 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:38:29 -0800 Subject: [PATCH 086/159] Removed unused variable Signed-off-by: snipe --- upgrade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/upgrade.php b/upgrade.php index 892e92e46c..0a82edfbf7 100644 --- a/upgrade.php +++ b/upgrade.php @@ -43,7 +43,6 @@ echo "--------------------------------------------------------\n\n"; // Check the .env looks ok $env = file('.env'); -$env_error_count = 0; $env_good = ''; $env_bad = ''; From b10ea0c25cf605a4b519a1319c9320f560b63dc9 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:38:56 -0800 Subject: [PATCH 087/159] Removed unused variable Signed-off-by: snipe --- upgrade.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/upgrade.php b/upgrade.php index 0a82edfbf7..e3bf64ce1e 100644 --- a/upgrade.php +++ b/upgrade.php @@ -84,7 +84,7 @@ foreach ($env as $line_num => $line) { if ($env_key == 'APP_KEY') { if (($env_value=='') || (strlen($env_value) < 20)) { - $env_bad .= "✘ APP_KEY ERROR in your .env on line #'.$show_line_num.': Your APP_KEY should not be blank. Run `php artisan key:generate` to generate one.\n"; + $env_bad .= "✘ APP_KEY ERROR in your .env on line #'.{$show_line_num}.': Your APP_KEY should not be blank. Run `php artisan key:generate` to generate one.\n"; } else { $env_good .= "√ Your APP_KEY is not blank. \n"; } @@ -92,8 +92,6 @@ foreach ($env as $line_num => $line) { if ($env_key == 'APP_URL') { - $app_url_length = strlen($env_value); - if (($env_value!="null") && ($env_value!="")) { $env_good .= '√ Your APP_URL is not null or blank. It is set to '.$env_value."\n"; From ec2afee57d3abc3ce9c04196559e0f9f95a197fb Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:39:12 -0800 Subject: [PATCH 088/159] Fixed yoda operator Signed-off-by: snipe --- upgrade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upgrade.php b/upgrade.php index e3bf64ce1e..ca71a61844 100644 --- a/upgrade.php +++ b/upgrade.php @@ -449,11 +449,11 @@ echo "--------------------------------------------------------\n\n"; function str_begins($haystack, $needle) { - return 0 === substr_compare($haystack, $needle, 0, strlen($needle)); + return (substr_compare($haystack, $needle, 0, strlen($needle)) === 0); } function str_ends($haystack, $needle) { - return 0 === substr_compare($haystack, $needle, -strlen($needle)); + return (substr_compare($haystack, $needle, -strlen($needle)) === 0); } From ab6ca0e06613fccbbf00a4110944c75a66d6341c Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:39:22 -0800 Subject: [PATCH 089/159] Added parens Signed-off-by: snipe --- routes/console.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/console.php b/routes/console.php index a4c876ae04..2413e4b189 100644 --- a/routes/console.php +++ b/routes/console.php @@ -20,7 +20,7 @@ Artisan::command('inspire', function () { Artisan::command('snipeit:travisci-install', function () { if (! Setting::setupCompleted()) { - $settings = new Setting; + $settings = new Setting(); $settings->site_name = 'test-ci'; $settings->alert_email = 'test@example.com'; $settings->alerts_enabled = 1; From 8841f04333ef61363250c631a906ec6e55bcdbc4 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:39:38 -0800 Subject: [PATCH 090/159] Fixed array bracket indenting Signed-off-by: snipe --- routes/api.php | 66 +++++++++++++++++--------------------------------- 1 file changed, 22 insertions(+), 44 deletions(-) diff --git a/routes/api.php b/routes/api.php index d9db5b78ee..37bc3baa8d 100644 --- a/routes/api.php +++ b/routes/api.php @@ -114,8 +114,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('accessories', Api\AccessoriesController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.accessories.index', 'show' => 'api.accessories.show', 'update' => 'api.accessories.update', @@ -144,8 +143,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('categories', Api\CategoriesController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.categories.index', 'show' => 'api.categories.show', 'update' => 'api.categories.update', @@ -173,8 +171,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('companies', Api\CompaniesController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.companies.index', 'show' => 'api.companies.show', 'update' => 'api.companies.update', @@ -203,8 +200,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('departments', Api\DepartmentsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.departments.index', 'show' => 'api.departments.show', 'update' => 'api.departments.update', @@ -254,8 +250,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('components', Api\ComponentsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.components.index', 'show' => 'api.components.show', 'update' => 'api.components.update', @@ -308,8 +303,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('consumables', Api\ConsumablesController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.consumables.index', 'show' => 'api.consumables.show', 'update' => 'api.consumables.update', @@ -328,8 +322,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi */ Route::resource('depreciations', Api\DepreciationsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.depreciations.index', 'show' => 'api.depreciations.show', 'update' => 'api.depreciations.update', @@ -416,8 +409,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('fieldsets', Api\CustomFieldsetsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.fieldsets.index', 'show' => 'api.fieldsets.show', 'update' => 'api.fieldsets.update', @@ -436,8 +428,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi */ Route::resource('groups', Api\GroupsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.groups.index', 'show' => 'api.groups.show', 'update' => 'api.groups.update', @@ -549,8 +540,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('hardware', Api\AssetsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.assets.index', 'show' => 'api.assets.show', 'update' => 'api.assets.update', @@ -567,8 +557,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi */ Route::resource('maintenances', Api\AssetMaintenancesController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.maintenances.index', 'show' => 'api.maintenances.show', 'update' => 'api.maintenances.update', @@ -597,8 +586,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('imports', Api\ImportController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.imports.index', 'show' => 'api.imports.show', 'update' => 'api.imports.update', @@ -628,8 +616,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('licenses', Api\LicensesController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.licenses.index', 'show' => 'api.licenses.show', 'update' => 'api.licenses.update', @@ -644,8 +631,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('licenses.seats', Api\LicenseSeatsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.licenses.seats.index', 'show' => 'api.licenses.seats.show', 'update' => 'api.licenses.seats.update', @@ -686,8 +672,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('locations', Api\LocationsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.locations.index', 'show' => 'api.locations.show', 'update' => 'api.locations.update', @@ -716,8 +701,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('manufacturers', Api\ManufacturersController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.manufacturers.index', 'show' => 'api.manufacturers.show', 'update' => 'api.manufacturers.update', @@ -753,8 +737,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('models', Api\AssetModelsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.models.index', 'show' => 'api.models.show', 'update' => 'api.models.update', @@ -833,8 +816,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('settings', Api\SettingsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.settings.index', 'show' => 'api.settings.show', 'update' => 'api.settings.update', @@ -891,8 +873,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('statuslabels', Api\StatuslabelsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.statuslabels.index', 'show' => 'api.statuslabels.show', 'update' => 'api.statuslabels.update', @@ -921,8 +902,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('suppliers', Api\SuppliersController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.suppliers.index', 'show' => 'api.suppliers.show', 'update' => 'api.suppliers.update', @@ -1015,8 +995,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi Route::resource('users', Api\UsersController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.users.index', 'show' => 'api.users.show', 'update' => 'api.users.update', @@ -1034,8 +1013,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi */ Route::resource('kits', Api\PredefinedKitsController::class, - ['names' => - [ + ['names' => [ 'index' => 'api.kits.index', 'show' => 'api.kits.show', 'update' => 'api.kits.update', From a60510c063b624ca42a1b28dfac4cd1dd6ef41a5 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:39:48 -0800 Subject: [PATCH 091/159] Added insights config Signed-off-by: snipe --- config/insights.php | 128 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 config/insights.php diff --git a/config/insights.php b/config/insights.php new file mode 100644 index 0000000000..f0393edeca --- /dev/null +++ b/config/insights.php @@ -0,0 +1,128 @@ + 'laravel', + + /* + |-------------------------------------------------------------------------- + | IDE + |-------------------------------------------------------------------------- + | + | This options allow to add hyperlinks in your terminal to quickly open + | files in your favorite IDE while browsing your PhpInsights report. + | + | Supported: "textmate", "macvim", "emacs", "sublime", "phpstorm", + | "atom", "vscode". + | + | If you have another IDE that is not in this list but which provide an + | url-handler, you could fill this config with a pattern like this: + | + | myide://open?url=file://%f&line=%l + | + */ + + 'ide' => null, + + /* + |-------------------------------------------------------------------------- + | Configuration + |-------------------------------------------------------------------------- + | + | Here you may adjust all the various `Insights` that will be used by PHP + | Insights. You can either add, remove or configure `Insights`. Keep in + | mind that all added `Insights` must belong to a specific `Metric`. + | + */ + + 'exclude' => [ + // 'path/to/directory-or-file' + ], + + 'add' => [ + Classes::class => [ + ForbiddenFinalClasses::class, + ], + ], + + 'remove' => [ + AlphabeticallySortedUsesSniff::class, + DeclareStrictTypesSniff::class, + DisallowMixedTypeHintSniff::class, + ForbiddenDefineFunctions::class, + ForbiddenNormalClasses::class, + ForbiddenTraits::class, + ParameterTypeHintSniff::class, + PropertyTypeHintSniff::class, + ReturnTypeHintSniff::class, + UselessFunctionDocCommentSniff::class, + ], + + 'config' => [ + ForbiddenPrivateMethods::class => [ + 'title' => 'The usage of private methods is not idiomatic in Laravel.', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Requirements + |-------------------------------------------------------------------------- + | + | Here you may define a level you want to reach per `Insights` category. + | When a score is lower than the minimum level defined, then an error + | code will be returned. This is optional and individually defined. + | + */ + + 'requirements' => [ +// 'min-quality' => 0, +// 'min-complexity' => 0, +// 'min-architecture' => 0, +// 'min-style' => 0, +// 'disable-security-check' => false, + ], + + /* + |-------------------------------------------------------------------------- + | Threads + |-------------------------------------------------------------------------- + | + | Here you may adjust how many threads (core) PHPInsights can use to perform + | the analyse. This is optional, don't provide it and the tool will guess + | the max core number available. It accepts null value or integer > 0. + | + */ + + 'threads' => null, + +]; From aeb8dfb07df1bbc79edcc09b4cddf0bbaddf26d7 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:39:55 -0800 Subject: [PATCH 092/159] Added phpinsights Signed-off-by: snipe --- composer.json | 1 + composer.lock | 1477 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 1476 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 06d8563039..f682ded9f5 100644 --- a/composer.json +++ b/composer.json @@ -75,6 +75,7 @@ "fakerphp/faker": "^1.16", "laravel/dusk": "^6.25", "mockery/mockery": "^1.4", + "nunomaduro/phpinsights": "^2.7", "phpunit/php-token-stream": "^3.1", "phpunit/phpunit": "^9.0", "squizlabs/php_codesniffer": "^3.5", diff --git a/composer.lock b/composer.lock index d23081089c..41757eb21a 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": "4fed0ab76a34ef85a44568e470abab48", + "content-hash": "03d904cb0c9cd4da1c3c0571bb15dae9", "packages": [ { "name": "alek13/slack", @@ -11727,6 +11727,302 @@ } ], "packages-dev": [ + { + "name": "composer/pcre", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.3", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.1.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-11-17T09:50:14+00:00" + }, + { + "name": "composer/semver", + "version": "3.3.2", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.4", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.3.2" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-04-01T19:23:25+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "ced299686f41dce890debac69273b47ffe98a40c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "shasum": "" + }, + "require": { + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-02-25T21:32:43+00:00" + }, + { + "name": "dealerdirect/phpcodesniffer-composer-installer", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/composer-installer.git", + "reference": "4be43904336affa5c2f70744a348312336afd0da" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/4be43904336affa5c2f70744a348312336afd0da", + "reference": "4be43904336affa5c2f70744a348312336afd0da", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.4", + "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" + }, + "require-dev": { + "composer/composer": "*", + "ext-json": "*", + "ext-zip": "*", + "php-parallel-lint/php-parallel-lint": "^1.3.1", + "phpcompatibility/php-compatibility": "^9.0", + "yoast/phpunit-polyfills": "^1.0" + }, + "type": "composer-plugin", + "extra": { + "class": "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin" + }, + "autoload": { + "psr-4": { + "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Franck Nijhof", + "email": "franck.nijhof@dealerdirect.com", + "homepage": "http://www.frenck.nl", + "role": "Developer / IT Manager" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/composer-installer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer Standards Composer Installer Plugin", + "homepage": "http://www.dealerdirect.com", + "keywords": [ + "PHPCodeSniffer", + "PHP_CodeSniffer", + "code quality", + "codesniffer", + "composer", + "installer", + "phpcbf", + "phpcs", + "plugin", + "qa", + "quality", + "standard", + "standards", + "style guide", + "stylecheck", + "tests" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/composer-installer/issues", + "source": "https://github.com/PHPCSStandards/composer-installer" + }, + "time": "2023-01-05T11:28:13+00:00" + }, { "name": "fakerphp/faker", "version": "v1.20.0", @@ -11794,6 +12090,95 @@ }, "time": "2022-07-20T13:12:54+00:00" }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v3.13.2", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "3952f08a81bd3b1b15e11c3de0b6bf037faa8496" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3952f08a81bd3b1b15e11c3de0b6bf037faa8496", + "reference": "3952f08a81bd3b1b15e11c3de0b6bf037faa8496", + "shasum": "" + }, + "require": { + "composer/semver": "^3.2", + "composer/xdebug-handler": "^3.0.3", + "doctrine/annotations": "^1.13", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0", + "sebastian/diff": "^4.0", + "symfony/console": "^5.4 || ^6.0", + "symfony/event-dispatcher": "^5.4 || ^6.0", + "symfony/filesystem": "^5.4 || ^6.0", + "symfony/finder": "^5.4 || ^6.0", + "symfony/options-resolver": "^5.4 || ^6.0", + "symfony/polyfill-mbstring": "^1.23", + "symfony/polyfill-php80": "^1.25", + "symfony/polyfill-php81": "^1.25", + "symfony/process": "^5.4 || ^6.0", + "symfony/stopwatch": "^5.4 || ^6.0" + }, + "require-dev": { + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^2.0", + "mikey179/vfsstream": "^1.6.10", + "php-coveralls/php-coveralls": "^2.5.2", + "php-cs-fixer/accessible-object": "^1.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", + "phpspec/prophecy": "^1.15", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "phpunitgoodpractices/polyfill": "^1.6", + "phpunitgoodpractices/traits": "^1.9.2", + "symfony/phpunit-bridge": "^6.0", + "symfony/yaml": "^5.4 || ^6.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "support": { + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.13.2" + }, + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2023-01-02T23:53:50+00:00" + }, { "name": "hamcrest/hamcrest-php", "version": "v2.0.1", @@ -11845,6 +12230,76 @@ }, "time": "2020-07-09T08:09:16+00:00" }, + { + "name": "justinrainbow/json-schema", + "version": "5.2.12", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", + "json-schema/json-schema-test-suite": "1.2.0", + "phpunit/phpunit": "^4.8.35" + }, + "bin": [ + "bin/validate-json" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "JsonSchema\\": "src/JsonSchema/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" + }, + { + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" + } + ], + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", + "keywords": [ + "json", + "schema" + ], + "support": { + "issues": "https://github.com/justinrainbow/json-schema/issues", + "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" + }, + "time": "2022-04-13T08:02:27+00:00" + }, { "name": "laravel/dusk", "version": "v6.25.2", @@ -11918,6 +12373,88 @@ }, "time": "2022-09-29T09:37:07+00:00" }, + { + "name": "league/container", + "version": "4.2.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/container.git", + "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/container/zipball/375d13cb828649599ef5d48a339c4af7a26cd0ab", + "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0", + "psr/container": "^1.1 || ^2.0" + }, + "provide": { + "psr/container-implementation": "^1.0" + }, + "replace": { + "orno/di": "~2.0" + }, + "require-dev": { + "nette/php-generator": "^3.4", + "nikic/php-parser": "^4.10", + "phpstan/phpstan": "^0.12.47", + "phpunit/phpunit": "^8.5.17", + "roave/security-advisories": "dev-latest", + "scrutinizer/ocular": "^1.8", + "squizlabs/php_codesniffer": "^3.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev", + "dev-4.x": "4.x-dev", + "dev-3.x": "3.x-dev", + "dev-2.x": "2.x-dev", + "dev-1.x": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Container\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Phil Bennett", + "email": "mail@philbennett.co.uk", + "role": "Developer" + } + ], + "description": "A fast and intuitive dependency injection container.", + "homepage": "https://github.com/thephpleague/container", + "keywords": [ + "container", + "dependency", + "di", + "injection", + "league", + "provider", + "service" + ], + "support": { + "issues": "https://github.com/thephpleague/container/issues", + "source": "https://github.com/thephpleague/container/tree/4.2.0" + }, + "funding": [ + { + "url": "https://github.com/philipobenito", + "type": "github" + } + ], + "time": "2021-11-16T10:29:06+00:00" + }, { "name": "mockery/mockery", "version": "1.5.0", @@ -12049,6 +12586,112 @@ ], "time": "2022-03-03T13:19:32+00:00" }, + { + "name": "nunomaduro/phpinsights", + "version": "v2.7.0", + "source": { + "type": "git", + "url": "https://github.com/nunomaduro/phpinsights.git", + "reference": "3a2f02cadcd1be920eed19814798810944698c51" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nunomaduro/phpinsights/zipball/3a2f02cadcd1be920eed19814798810944698c51", + "reference": "3a2f02cadcd1be920eed19814798810944698c51", + "shasum": "" + }, + "require": { + "composer/semver": "^3.3", + "ext-iconv": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-tokenizer": "*", + "friendsofphp/php-cs-fixer": "^3.0.0", + "justinrainbow/json-schema": "^5.1", + "league/container": "^3.2|^4.2", + "php": "^7.4 || ^8.0", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phploc/phploc": "^5.0|^6.0|^7.0", + "psr/container": "^1.0|^2.0", + "psr/simple-cache": "^1.0|^2.0|^3.0", + "sebastian/diff": "^4.0", + "slevomat/coding-standard": "^7.0.8|^8.0", + "squizlabs/php_codesniffer": "^3.5", + "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/console": "^4.2|^5.0|^6.0", + "symfony/finder": "^4.2|^5.0|^6.0", + "symfony/http-client": "^4.3|^5.0|^6.0", + "symfony/process": "^5.4|^6.0" + }, + "require-dev": { + "ergebnis/phpstan-rules": "^0.15.0", + "illuminate/console": "^5.8|^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^5.8|^6.0|^7.0|^8.0|^9.0", + "mockery/mockery": "^1.0", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^8.0|^9.0", + "rector/rector": "0.11.56", + "symfony/var-dumper": "^4.2|^5.0|^6.0", + "thecodingmachine/phpstan-strict-rules": "^0.12.0" + }, + "suggest": { + "ext-simplexml": "It is needed for the checkstyle formatter" + }, + "bin": [ + "bin/phpinsights" + ], + "type": "library", + "extra": { + "laravel": { + "providers": [ + "NunoMaduro\\PhpInsights\\Application\\Adapters\\Laravel\\InsightsServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "NunoMaduro\\PhpInsights\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" + } + ], + "description": "Instant PHP quality checks from your console.", + "keywords": [ + "Insights", + "code", + "console", + "php", + "quality", + "source" + ], + "support": { + "issues": "https://github.com/nunomaduro/phpinsights/issues", + "source": "https://github.com/nunomaduro/phpinsights/tree/v2.7.0" + }, + "funding": [ + { + "url": "https://github.com/JustSteveKing", + "type": "github" + }, + { + "url": "https://github.com/cmgmyr", + "type": "github" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + } + ], + "time": "2023-01-30T20:28:59+00:00" + }, { "name": "phar-io/manifest", "version": "2.0.3", @@ -12160,6 +12803,63 @@ }, "time": "2022-02-21T01:04:05+00:00" }, + { + "name": "php-parallel-lint/php-parallel-lint", + "version": "v1.3.2", + "source": { + "type": "git", + "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", + "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6483c9832e71973ed29cf71bd6b3f4fde438a9de", + "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=5.3.0" + }, + "replace": { + "grogy/php-parallel-lint": "*", + "jakub-onderka/php-parallel-lint": "*" + }, + "require-dev": { + "nette/tester": "^1.3 || ^2.0", + "php-parallel-lint/php-console-highlighter": "0.* || ^1.0", + "squizlabs/php_codesniffer": "^3.6" + }, + "suggest": { + "php-parallel-lint/php-console-highlighter": "Highlight syntax in code snippet" + }, + "bin": [ + "parallel-lint" + ], + "type": "library", + "autoload": { + "classmap": [ + "./src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "ahoj@jakubonderka.cz" + } + ], + "description": "This tool check syntax of PHP files about 20x faster than serial check.", + "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint", + "support": { + "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues", + "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.2" + }, + "time": "2022-02-21T12:50:22+00:00" + }, { "name": "php-webdriver/webdriver", "version": "1.12.1", @@ -12225,6 +12925,112 @@ }, "time": "2022-05-03T12:16:34+00:00" }, + { + "name": "phploc/phploc", + "version": "7.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phploc.git", + "reference": "af0d5fc84f3f7725513ba59cdcbe670ac2a4532a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/af0d5fc84f3f7725513ba59cdcbe670ac2a4532a", + "reference": "af0d5fc84f3f7725513ba59cdcbe670ac2a4532a", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0", + "sebastian/cli-parser": "^1.0", + "sebastian/version": "^3.0" + }, + "bin": [ + "phploc" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "7.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "A tool for quickly measuring the size of a PHP project.", + "homepage": "https://github.com/sebastianbergmann/phploc", + "support": { + "issues": "https://github.com/sebastianbergmann/phploc/issues", + "source": "https://github.com/sebastianbergmann/phploc/tree/7.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-12-07T05:51:20+00:00" + }, + { + "name": "phpstan/phpdoc-parser", + "version": "1.15.3", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpdoc-parser.git", + "reference": "61800f71a5526081d1b5633766aa88341f1ade76" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/61800f71a5526081d1b5633766aa88341f1ade76", + "reference": "61800f71a5526081d1b5633766aa88341f1ade76", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5", + "symfony/process": "^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "PHPStan\\PhpDocParser\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPDoc parser with support for nullable, intersection and generic types", + "support": { + "issues": "https://github.com/phpstan/phpdoc-parser/issues", + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.15.3" + }, + "time": "2022-12-20T20:56:55+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "9.2.15", @@ -13389,6 +14195,247 @@ ], "time": "2020-09-28T06:39:44+00:00" }, + { + "name": "slevomat/coding-standard", + "version": "8.8.0", + "source": { + "type": "git", + "url": "https://github.com/slevomat/coding-standard.git", + "reference": "59e25146a4ef0a7b194c5bc55b32dd414345db89" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/59e25146a4ef0a7b194c5bc55b32dd414345db89", + "reference": "59e25146a4ef0a7b194c5bc55b32dd414345db89", + "shasum": "" + }, + "require": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", + "php": "^7.2 || ^8.0", + "phpstan/phpdoc-parser": ">=1.15.2 <1.16.0", + "squizlabs/php_codesniffer": "^3.7.1" + }, + "require-dev": { + "phing/phing": "2.17.4", + "php-parallel-lint/php-parallel-lint": "1.3.2", + "phpstan/phpstan": "1.4.10|1.9.6", + "phpstan/phpstan-deprecation-rules": "1.1.1", + "phpstan/phpstan-phpunit": "1.0.0|1.3.3", + "phpstan/phpstan-strict-rules": "1.4.4", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.27" + }, + "type": "phpcodesniffer-standard", + "extra": { + "branch-alias": { + "dev-master": "8.x-dev" + } + }, + "autoload": { + "psr-4": { + "SlevomatCodingStandard\\": "SlevomatCodingStandard" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", + "keywords": [ + "dev", + "phpcs" + ], + "support": { + "issues": "https://github.com/slevomat/coding-standard/issues", + "source": "https://github.com/slevomat/coding-standard/tree/8.8.0" + }, + "funding": [ + { + "url": "https://github.com/kukulich", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/slevomat/coding-standard", + "type": "tidelift" + } + ], + "time": "2023-01-09T10:46:13+00:00" + }, + { + "name": "symfony/cache", + "version": "v5.4.19", + "source": { + "type": "git", + "url": "https://github.com/symfony/cache.git", + "reference": "e9147c89fdfdc5d5ef798bb7193f23726ad609f5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/cache/zipball/e9147c89fdfdc5d5ef798bb7193f23726ad609f5", + "reference": "e9147c89fdfdc5d5ef798bb7193f23726ad609f5", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/cache": "^1.0|^2.0", + "psr/log": "^1.1|^2|^3", + "symfony/cache-contracts": "^1.1.7|^2", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/var-exporter": "^4.4|^5.0|^6.0" + }, + "conflict": { + "doctrine/dbal": "<2.13.1", + "symfony/dependency-injection": "<4.4", + "symfony/http-kernel": "<4.4", + "symfony/var-dumper": "<4.4" + }, + "provide": { + "psr/cache-implementation": "1.0|2.0", + "psr/simple-cache-implementation": "1.0|2.0", + "symfony/cache-implementation": "1.0|2.0" + }, + "require-dev": { + "cache/integration-tests": "dev-master", + "doctrine/cache": "^1.6|^2.0", + "doctrine/dbal": "^2.13.1|^3.0", + "predis/predis": "^1.1", + "psr/simple-cache": "^1.0|^2.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Cache\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides extended PSR-6, PSR-16 (and tags) implementations", + "homepage": "https://symfony.com", + "keywords": [ + "caching", + "psr6" + ], + "support": { + "source": "https://github.com/symfony/cache/tree/v5.4.19" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-19T09:49:58+00:00" + }, + { + "name": "symfony/cache-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/cache-contracts.git", + "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", + "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/cache": "^1.0|^2.0|^3.0" + }, + "suggest": { + "symfony/cache-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Cache\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to caching", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/cache-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, { "name": "symfony/dom-crawler", "version": "v4.4.42", @@ -13463,6 +14510,432 @@ ], "time": "2022-04-30T18:34:00+00:00" }, + { + "name": "symfony/filesystem", + "version": "v6.0.19", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "3d49eec03fda1f0fc19b7349fbbe55ebc1004214" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/3d49eec03fda1f0fc19b7349fbbe55ebc1004214", + "reference": "3d49eec03fda1f0fc19b7349fbbe55ebc1004214", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v6.0.19" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-20T17:44:14+00:00" + }, + { + "name": "symfony/http-client", + "version": "v6.0.20", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client.git", + "reference": "541c04560da1875f62c963c3aab6ea12a7314e11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client/zipball/541c04560da1875f62c963c3aab6ea12a7314e11", + "reference": "541c04560da1875f62c963c3aab6ea12a7314e11", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "psr/log": "^1|^2|^3", + "symfony/http-client-contracts": "^3", + "symfony/service-contracts": "^1.0|^2|^3" + }, + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "1.0", + "symfony/http-client-implementation": "3.0" + }, + "require-dev": { + "amphp/amp": "^2.5", + "amphp/http-client": "^4.2.1", + "amphp/http-tunnel": "^1.0", + "amphp/socket": "^1.1", + "guzzlehttp/promises": "^1.4", + "nyholm/psr7": "^1.0", + "php-http/httplug": "^1.0|^2.0", + "psr/http-client": "^1.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/stopwatch": "^5.4|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpClient\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-client/tree/v6.0.20" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-30T15:41:07+00:00" + }, + { + "name": "symfony/http-client-contracts", + "version": "v3.0.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client-contracts.git", + "reference": "4184b9b63af1edaf35b6a7974c6f1f9f33294129" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/4184b9b63af1edaf35b6a7974c6f1f9f33294129", + "reference": "4184b9b63af1edaf35b6a7974c6f1f9f33294129", + "shasum": "" + }, + "require": { + "php": ">=8.0.2" + }, + "suggest": { + "symfony/http-client-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\HttpClient\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to HTTP clients", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/http-client-contracts/tree/v3.0.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-04-12T16:11:42+00:00" + }, + { + "name": "symfony/options-resolver", + "version": "v6.0.19", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "6a180d1c45e0d9797470ca9eb46215692de00fa3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/6a180d1c45e0d9797470ca9eb46215692de00fa3", + "reference": "6a180d1c45e0d9797470ca9eb46215692de00fa3", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/deprecation-contracts": "^2.1|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v6.0.19" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-01T08:36:10+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v6.0.19", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "011e781839dd1d2eb8119f65ac516a530f60226d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/011e781839dd1d2eb8119f65ac516a530f60226d", + "reference": "011e781839dd1d2eb8119f65ac516a530f60226d", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/service-contracts": "^1|^2|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v6.0.19" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-01T08:36:10+00:00" + }, + { + "name": "symfony/var-exporter", + "version": "v6.0.19", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-exporter.git", + "reference": "df56f53818c2d5d9f683f4ad2e365ba73a3b69d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/df56f53818c2d5d9f683f4ad2e365ba73a3b69d2", + "reference": "df56f53818c2d5d9f683f4ad2e365ba73a3b69d2", + "shasum": "" + }, + "require": { + "php": ">=8.0.2" + }, + "require-dev": { + "symfony/var-dumper": "^5.4|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\VarExporter\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows exporting any serializable PHP data structure to plain PHP code", + "homepage": "https://symfony.com", + "keywords": [ + "clone", + "construct", + "export", + "hydrate", + "instantiate", + "serialize" + ], + "support": { + "source": "https://github.com/symfony/var-exporter/tree/v6.0.19" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-13T08:34:10+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.1", @@ -13530,5 +15003,5 @@ "ext-pdo": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.0.0" } From 590cb6a15b7c2ed28aec2415bdeece54d8347f9f Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:40:09 -0800 Subject: [PATCH 093/159] Removed unneeded concat Signed-off-by: snipe --- app/Presenters/UserPresenter.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index 8f5cfcccf5..bf4c81c809 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -346,8 +346,7 @@ class UserPresenter extends Presenter public function emailLink() { if ($this->email) { - return ''.$this->email.'' - .''; + return ''.$this->email.''; } return ''; From 8a8575bf2dfbda3f6736ecec074e7073d5dc0a51 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:40:32 -0800 Subject: [PATCH 094/159] Made constant DATA_SESSION_KEY public Signed-off-by: snipe --- app/Services/Saml.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Services/Saml.php b/app/Services/Saml.php index c8fed32bb1..3f39be29ff 100644 --- a/app/Services/Saml.php +++ b/app/Services/Saml.php @@ -22,7 +22,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException; */ class Saml { - const DATA_SESSION_KEY = '_samlData'; + public const DATA_SESSION_KEY = '_samlData'; /** * OneLogin_Saml2_Auth instance. @@ -308,12 +308,9 @@ class Saml */ public function samlLogin($data) { - $setting = Setting::getSettings(); $this->saveDataToSession($data); $this->loadDataFromSession(); - $username = $this->getUsername(); - return User::where('username', '=', $username)->whereNull('deleted_at')->where('activated', '=', '1')->first(); } From d95adcae372e6b448b59b3eae9e05d4664f53271 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:41:54 -0800 Subject: [PATCH 095/159] Fixed Implicit array creation is disallowed. Signed-off-by: snipe --- app/Notifications/AcceptanceAssetAcceptedNotification.php | 2 +- app/Notifications/AcceptanceAssetDeclinedNotification.php | 2 +- app/Notifications/InventoryAlert.php | 2 +- app/Notifications/SendUpcomingAuditNotification.php | 2 +- app/Notifications/WelcomeNotification.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Notifications/AcceptanceAssetAcceptedNotification.php b/app/Notifications/AcceptanceAssetAcceptedNotification.php index c667588dae..93e75df7b3 100644 --- a/app/Notifications/AcceptanceAssetAcceptedNotification.php +++ b/app/Notifications/AcceptanceAssetAcceptedNotification.php @@ -40,7 +40,7 @@ class AcceptanceAssetAcceptedNotification extends Notification public function via() { - $notifyBy[] = 'mail'; + $notifyBy = ['mail']; return $notifyBy; diff --git a/app/Notifications/AcceptanceAssetDeclinedNotification.php b/app/Notifications/AcceptanceAssetDeclinedNotification.php index 9446747353..82a8de9210 100644 --- a/app/Notifications/AcceptanceAssetDeclinedNotification.php +++ b/app/Notifications/AcceptanceAssetDeclinedNotification.php @@ -38,7 +38,7 @@ class AcceptanceAssetDeclinedNotification extends Notification */ public function via($notifiable) { - $notifyBy[] = 'mail'; + $notifyBy = ['mail']; return $notifyBy; diff --git a/app/Notifications/InventoryAlert.php b/app/Notifications/InventoryAlert.php index ff88b548c0..6d59e3b42a 100644 --- a/app/Notifications/InventoryAlert.php +++ b/app/Notifications/InventoryAlert.php @@ -32,7 +32,7 @@ class InventoryAlert extends Notification */ public function via() { - $notifyBy[] = 'mail'; + $notifyBy = ['mail']; return $notifyBy; } diff --git a/app/Notifications/SendUpcomingAuditNotification.php b/app/Notifications/SendUpcomingAuditNotification.php index a883220f2f..a1005494f6 100644 --- a/app/Notifications/SendUpcomingAuditNotification.php +++ b/app/Notifications/SendUpcomingAuditNotification.php @@ -40,7 +40,7 @@ class SendUpcomingAuditNotification extends Notification */ public function toMail() { - $message = (new MailMessage)->markdown('notifications.markdown.upcoming-audits', + $message = (new MailMessage())->markdown('notifications.markdown.upcoming-audits', [ 'assets' => $this->assets, 'threshold' => $this->threshold, diff --git a/app/Notifications/WelcomeNotification.php b/app/Notifications/WelcomeNotification.php index 639f622188..a5754be4d9 100644 --- a/app/Notifications/WelcomeNotification.php +++ b/app/Notifications/WelcomeNotification.php @@ -44,7 +44,7 @@ class WelcomeNotification extends Notification */ public function toMail() { - return (new MailMessage) + return (new MailMessage()) ->subject(trans('mail.welcome', ['name' => $this->_data['first_name'].' '.$this->_data['last_name']])) ->markdown('notifications.Welcome', $this->_data); } From 1651dbb68d52352b07830794ea39353a51b1849f Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:43:00 -0800 Subject: [PATCH 096/159] Use null coalescing operator Signed-off-by: snipe --- app/Console/Commands/LdapSync.php | 24 ++++++++++++------------ app/Models/Ldap.php | 20 ++++++++++---------- app/Models/Traits/Searchable.php | 6 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php index c2d7446934..13a1ee2d3f 100755 --- a/app/Console/Commands/LdapSync.php +++ b/app/Console/Commands/LdapSync.php @@ -197,18 +197,18 @@ class LdapSync extends Command for ($i = 0; $i < $results['count']; $i++) { $item = []; - $item['username'] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : ''; - $item['employee_number'] = isset($results[$i][$ldap_result_emp_num][0]) ? $results[$i][$ldap_result_emp_num][0] : ''; - $item['lastname'] = isset($results[$i][$ldap_result_last_name][0]) ? $results[$i][$ldap_result_last_name][0] : ''; - $item['firstname'] = isset($results[$i][$ldap_result_first_name][0]) ? $results[$i][$ldap_result_first_name][0] : ''; - $item['email'] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : ''; - $item['ldap_location_override'] = isset($results[$i]['ldap_location_override']) ? $results[$i]['ldap_location_override'] : ''; - $item['location_id'] = isset($results[$i]['location_id']) ? $results[$i]['location_id'] : ''; - $item['telephone'] = isset($results[$i][$ldap_result_phone][0]) ? $results[$i][$ldap_result_phone][0] : ''; - $item['jobtitle'] = isset($results[$i][$ldap_result_jobtitle][0]) ? $results[$i][$ldap_result_jobtitle][0] : ''; - $item['country'] = isset($results[$i][$ldap_result_country][0]) ? $results[$i][$ldap_result_country][0] : ''; - $item['department'] = isset($results[$i][$ldap_result_dept][0]) ? $results[$i][$ldap_result_dept][0] : ''; - $item['manager'] = isset($results[$i][$ldap_result_manager][0]) ? $results[$i][$ldap_result_manager][0] : ''; + $item['username'] = $results[$i][$ldap_result_username][0] ?? ''; + $item['employee_number'] = $results[$i][$ldap_result_emp_num][0] ?? ''; + $item['lastname'] = $results[$i][$ldap_result_last_name][0] ?? ''; + $item['firstname'] = $results[$i][$ldap_result_first_name][0] ?? ''; + $item['email'] = $results[$i][$ldap_result_email][0] ?? ''; + $item['ldap_location_override'] = $results[$i]['ldap_location_override'] ?? ''; + $item['location_id'] = $results[$i]['location_id'] ?? ''; + $item['telephone'] = $results[$i][$ldap_result_phone][0] ?? ''; + $item['jobtitle'] = $results[$i][$ldap_result_jobtitle][0] ?? ''; + $item['country'] = $results[$i][$ldap_result_country][0] ?? ''; + $item['department'] = $results[$i][$ldap_result_dept][0] ?? ''; + $item['manager'] = $results[$i][$ldap_result_manager][0] ?? ''; $department = Department::firstOrCreate([ diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php index 4c47147625..a29581bf97 100644 --- a/app/Models/Ldap.php +++ b/app/Models/Ldap.php @@ -217,16 +217,16 @@ class Ldap extends Model $ldap_result_manager = Setting::getSettings()->ldap_manager; // Get LDAP user data $item = []; - $item['username'] = isset($ldapattributes[$ldap_result_username][0]) ? $ldapattributes[$ldap_result_username][0] : ''; - $item['employee_number'] = isset($ldapattributes[$ldap_result_emp_num][0]) ? $ldapattributes[$ldap_result_emp_num][0] : ''; - $item['lastname'] = isset($ldapattributes[$ldap_result_last_name][0]) ? $ldapattributes[$ldap_result_last_name][0] : ''; - $item['firstname'] = isset($ldapattributes[$ldap_result_first_name][0]) ? $ldapattributes[$ldap_result_first_name][0] : ''; - $item['email'] = isset($ldapattributes[$ldap_result_email][0]) ? $ldapattributes[$ldap_result_email][0] : ''; - $item['telephone'] = isset($ldapattributes[$ldap_result_phone][0]) ? $ldapattributes[$ldap_result_phone][0] : ''; - $item['jobtitle'] = isset($ldapattributes[$ldap_result_jobtitle][0]) ? $ldapattributes[$ldap_result_jobtitle][0] : ''; - $item['country'] = isset($ldapattributes[$ldap_result_country][0]) ? $ldapattributes[$ldap_result_country][0] : ''; - $item['department'] = isset($ldapattributes[$ldap_result_dept][0]) ? $ldapattributes[$ldap_result_dept][0] : ''; - $item['manager'] = isset($ldapattributes[$ldap_result_manager][0]) ? $ldapattributes[$ldap_result_manager][0] : ''; + $item['username'] = $ldapattributes[$ldap_result_username][0] ?? ''; + $item['employee_number'] = $ldapattributes[$ldap_result_emp_num][0] ?? ''; + $item['lastname'] = $ldapattributes[$ldap_result_last_name][0] ?? ''; + $item['firstname'] = $ldapattributes[$ldap_result_first_name][0] ?? ''; + $item['email'] = $ldapattributes[$ldap_result_email][0] ?? ''; + $item['telephone'] = $ldapattributes[$ldap_result_phone][0] ?? ''; + $item['jobtitle'] = $ldapattributes[$ldap_result_jobtitle][0] ?? ''; + $item['country'] = $ldapattributes[$ldap_result_country][0] ?? ''; + $item['department'] = $ldapattributes[$ldap_result_dept][0] ?? ''; + $item['manager'] = $ldapattributes[$ldap_result_manager][0] ?? ''; return $item; } diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php index db46e305df..a7feb62957 100644 --- a/app/Models/Traits/Searchable.php +++ b/app/Models/Traits/Searchable.php @@ -164,7 +164,7 @@ trait Searchable } // I put this here because I only want to add the concat one time in the end of the user relation search if($relation == 'user') { - $query->orWhereRaw('CONCAT (users.first_name, " ", users.last_name) LIKE ?', ["%$term%"]); + $query->orWhereRaw('CONCAT (users.first_name, " ", users.last_name) LIKE ?', ["%{$term}%"]); } }); } @@ -195,7 +195,7 @@ trait Searchable */ private function getSearchableAttributes() { - return isset($this->searchableAttributes) ? $this->searchableAttributes : []; + return $this->searchableAttributes ?? []; } /** @@ -205,7 +205,7 @@ trait Searchable */ private function getSearchableRelations() { - return isset($this->searchableRelations) ? $this->searchableRelations : []; + return $this->searchableRelations ?? []; } /** From c8c5dddcc12ac43ab7b8f7d55f3c434273624971 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:43:19 -0800 Subject: [PATCH 097/159] Removed unused else condition Signed-off-by: snipe --- app/Http/Controllers/ReportsController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 6cf2091f60..8e29498606 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -1120,8 +1120,6 @@ class ReportsController extends Controller $row[] = str_replace(',', '', e($item['assetItem']->asset_tag)); $row[] = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user'))); $rows[] = implode(',', $row); - } else { - // Log the error maybe? } } From 7363d4e2234176f7a05db42f318a6be1a1a7f033 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:43:35 -0800 Subject: [PATCH 098/159] FIxed yoda operator Signed-off-by: snipe --- app/Http/Controllers/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 9a7c2cc7d5..d8f7ee3b64 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -807,7 +807,7 @@ class SettingsController extends Controller */ public function getPhpInfo() { - if (true === config('app.debug')) { + if (config('app.debug') === true) { return view('settings.phpinfo'); } From d52d32fed9b1b479593d59991e5b7266b128d15e Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:44:02 -0800 Subject: [PATCH 099/159] Fixed visibility for constants and methods Signed-off-by: snipe --- app/Http/Controllers/ModalController.php | 2 +- app/Http/Middleware/CheckForTwoFactor.php | 2 +- app/Models/Asset.php | 6 +++--- app/Models/CustomField.php | 2 +- app/Models/Setting.php | 2 +- app/Models/User.php | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php index 385877a3ec..6f6b39dd12 100644 --- a/app/Http/Controllers/ModalController.php +++ b/app/Http/Controllers/ModalController.php @@ -17,7 +17,7 @@ class ModalController extends Controller * @author [A. Gianotto] [ '', 'CUSTOM REGEX' => '', 'ALPHA' => 'alpha', diff --git a/app/Models/Setting.php b/app/Models/Setting.php index f2a4184178..8f1f652017 100755 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -31,7 +31,7 @@ class Setting extends Model * * @var string */ - const SETUP_CHECK_KEY = 'snipeit_setup_check'; + public const SETUP_CHECK_KEY = 'snipeit_setup_check'; /** * Whether the model should inject it's identifier to the unique diff --git a/app/Models/User.php b/app/Models/User.php index 34c0af6b2e..71025eaefe 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -657,7 +657,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo { $query = $query->where('first_name', 'LIKE', '%'.$search.'%') ->orWhere('last_name', 'LIKE', '%'.$search.'%') - ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%$search%"]); + ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]); return $query; } @@ -673,7 +673,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo public function advancedTextSearch(Builder $query, array $terms) { foreach($terms as $term) { - $query = $query->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%$term%"]); + $query = $query->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$term}%"]); } return $query; From cd5546e4a1b7fc6330ef3c1f010560e527927f7f Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Feb 2023 12:44:17 -0800 Subject: [PATCH 100/159] Fixed wonky switch statement indenting Signed-off-by: snipe --- app/Http/Requests/SaveUserRequest.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/Http/Requests/SaveUserRequest.php b/app/Http/Requests/SaveUserRequest.php index b6e44c3f44..98e561549e 100644 --- a/app/Http/Requests/SaveUserRequest.php +++ b/app/Http/Requests/SaveUserRequest.php @@ -39,14 +39,12 @@ class SaveUserRequest extends FormRequest // Brand new user case 'POST': - { $rules['first_name'] = 'required|string|min:1'; $rules['username'] = 'required_unless:ldap_import,1|string|min:1'; if ($this->request->get('ldap_import') == false) { $rules['password'] = Setting::passwordComplexityRulesSaving('store').'|confirmed'; } break; - } // Save all fields case 'PUT': @@ -57,12 +55,11 @@ class SaveUserRequest extends FormRequest // Save only what's passed case 'PATCH': - { $rules['password'] = Setting::passwordComplexityRulesSaving('update'); break; - } - default:break; + default: + break; } return $rules; From ddabe7cc9f0328126237612f89685d2a0d9681b3 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Tue, 7 Feb 2023 01:36:55 -0600 Subject: [PATCH 101/159] Added Guard Clause to License Importer to return if no empty seat is found --- app/Importer/LicenseImporter.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php index 894c50bbfa..3bfbf1ee26 100644 --- a/app/Importer/LicenseImporter.php +++ b/app/Importer/LicenseImporter.php @@ -80,6 +80,11 @@ class LicenseImporter extends ItemImporter $checkout_target = $this->item['checkout_target']; $asset = Asset::where('asset_tag', $asset_tag)->first(); $targetLicense = $license->freeSeat(); + + if (is_null($targetLicense)){ + return; + } + if ($checkout_target) { $targetLicense->assigned_to = $checkout_target->id; $targetLicense->user_id = Auth::id(); From d4c838a9797527948636867f171ad5e0329edea6 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Tue, 7 Feb 2023 11:26:49 -0600 Subject: [PATCH 102/159] Add condition in activity report to only access assigned item id if it exist --- app/Http/Transformers/ActionlogsTransformer.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index c58760d4de..cd2ce586d1 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -60,12 +60,14 @@ class ActionlogsTransformer if ($actionlog->action_type == 'accepted') { $file_url = route('log.storedeula.download', ['filename' => $actionlog->filename]); } else { - if ($actionlog->itemType() == 'asset') { - $file_url = route('show/assetfile', ['assetId' => $actionlog->item->id, 'fileId' => $actionlog->id]); - } elseif ($actionlog->itemType() == 'license') { - $file_url = route('show.licensefile', ['licenseId' => $actionlog->item->id, 'fileId' => $actionlog->id]); - } elseif ($actionlog->itemType() == 'user') { - $file_url = route('show/userfile', ['userId' => $actionlog->item->id, 'fileId' => $actionlog->id]); + if ($actionlog->item) { + if ($actionlog->itemType() == 'asset') { + $file_url = route('show/assetfile', ['assetId' => $actionlog->item->id, 'fileId' => $actionlog->id]); + } elseif ($actionlog->itemType() == 'license') { + $file_url = route('show.licensefile', ['licenseId' => $actionlog->item->id, 'fileId' => $actionlog->id]); + } elseif ($actionlog->itemType() == 'user') { + $file_url = route('show/userfile', ['userId' => $actionlog->item->id, 'fileId' => $actionlog->id]); + } } } } From 219d92dcfbc32188d2ea97a74a7dce28db462174 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 Feb 2023 11:00:30 -0800 Subject: [PATCH 103/159] The sea, Brady. Signed-off-by: snipe --- app/Console/Commands/LdapSync.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php index 13a1ee2d3f..975db4f5d7 100755 --- a/app/Console/Commands/LdapSync.php +++ b/app/Console/Commands/LdapSync.php @@ -74,7 +74,7 @@ class LdapSync extends Command $json_summary = ['error' => true, 'error_message' => $e->getMessage(), 'summary' => []]; $this->info(json_encode($json_summary)); } - LOG::info($e); + Log::info($e); return []; } @@ -84,7 +84,7 @@ class LdapSync extends Command try { if ($this->option('base_dn') != '') { $search_base = $this->option('base_dn'); - LOG::debug('Importing users from specified base DN: \"'.$search_base.'\".'); + Log::debug('Importing users from specified base DN: \"'.$search_base.'\".'); } else { $search_base = null; } @@ -98,7 +98,7 @@ class LdapSync extends Command $json_summary = ['error' => true, 'error_message' => $e->getMessage(), 'summary' => []]; $this->info(json_encode($json_summary)); } - LOG::info($e); + Log::info($e); return []; } @@ -108,16 +108,16 @@ class LdapSync extends Command if ($this->option('location') != '') { $location = Location::where('name', '=', $this->option('location'))->first(); - LOG::debug('Location name '.$this->option('location').' passed'); - LOG::debug('Importing to '.$location->name.' ('.$location->id.')'); + Log::debug('Location name '.$this->option('location').' passed'); + Log::debug('Importing to '.$location->name.' ('.$location->id.')'); } elseif ($this->option('location_id') != '') { $location = Location::where('id', '=', $this->option('location_id'))->first(); - LOG::debug('Location ID '.$this->option('location_id').' passed'); - LOG::debug('Importing to '.$location->name.' ('.$location->id.')'); + Log::debug('Location ID '.$this->option('location_id').' passed'); + Log::debug('Importing to '.$location->name.' ('.$location->id.')'); } if (! isset($location)) { - LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.'); + Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.'); } /* Process locations with explicitly defined OUs, if doing a full import. */ @@ -133,7 +133,7 @@ class LdapSync extends Command array_multisort($ldap_ou_lengths, SORT_ASC, $ldap_ou_locations); if (count($ldap_ou_locations) > 0) { - LOG::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.'); + Log::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.'); } // Inject location information fields @@ -151,7 +151,7 @@ class LdapSync extends Command $json_summary = ['error' => true, 'error_message' => trans('admin/users/message.error.ldap_could_not_search').' Location: '.$ldap_loc['name'].' (ID: '.$ldap_loc['id'].') cannot connect to "'.$ldap_loc['ldap_ou'].'" - '.$e->getMessage(), 'summary' => []]; $this->info(json_encode($json_summary)); } - LOG::info($e); + Log::info($e); return []; } From 32be88d796fa3404293e0c08c99369486e3ccd32 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 Feb 2023 11:00:59 -0800 Subject: [PATCH 104/159] Psalm and phpstan configs Signed-off-by: snipe --- phpstan.neon | 22 ++++++++++++++++++++++ psalm.xml | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 phpstan.neon create mode 100644 psalm.xml diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 0000000000..12cdbff72a --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,22 @@ +parameters: + paths: + - app + - resources/views + - resources/lang + - database/migrations + - config + + level: 4 + + ignoreErrors: + - '#Class, interface or enum named #' + - '#Call to an undefined static method App\\Models\\.*::where.*\(\)#' + - '#Call to an undefined static method App\\Models\\.*::firstOr.*\(\)#' + - '#Call to an undefined static method App\\Models\\.*::find.*\(\)#' + - '#Call to an undefined static method App\\Models\\.*::get.*\(\)#' + - '#Call to an undefined static method App\\Models\\.*::has.*\(\)#' + - '#Call to static method info\(\) on an unknown class Log#' + - '#Call to static method debug\(\) on an unknown class Log#' + - '#Call to static method getSchemaBuilder\(\) on an unknown class DB#' + - '#Call to static method call\(\) on an unknown class Artisan.#' + diff --git a/psalm.xml b/psalm.xml new file mode 100644 index 0000000000..4c8b877262 --- /dev/null +++ b/psalm.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + From f4617d8d5b12a968e1711d347760693c1e0f40cb Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 Feb 2023 11:01:21 -0800 Subject: [PATCH 105/159] Added larastan and psalm to composer dev Signed-off-by: snipe --- composer.json | 4 +- composer.lock | 1339 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 1341 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f682ded9f5..4e71debc65 100644 --- a/composer.json +++ b/composer.json @@ -75,12 +75,14 @@ "fakerphp/faker": "^1.16", "laravel/dusk": "^6.25", "mockery/mockery": "^1.4", + "nunomaduro/larastan": "^1.0", "nunomaduro/phpinsights": "^2.7", "phpunit/php-token-stream": "^3.1", "phpunit/phpunit": "^9.0", "squizlabs/php_codesniffer": "^3.5", "symfony/css-selector": "^4.4", - "symfony/dom-crawler": "^4.4" + "symfony/dom-crawler": "^4.4", + "vimeo/psalm": "^5.6" }, "extra": { "laravel": { diff --git a/composer.lock b/composer.lock index 41757eb21a..b9022ba84f 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": "03d904cb0c9cd4da1c3c0571bb15dae9", + "content-hash": "9bd2bbbd4b08d23336364da3d3a4561a", "packages": [ { "name": "alek13/slack", @@ -11727,6 +11727,500 @@ } ], "packages-dev": [ + { + "name": "amphp/amp", + "version": "v2.6.2", + "source": { + "type": "git", + "url": "https://github.com/amphp/amp.git", + "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1", + "ext-json": "*", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^7 | ^8 | ^9", + "psalm/phar": "^3.11@dev", + "react/promise": "^2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "files": [ + "lib/functions.php", + "lib/Internal/functions.php" + ], + "psr-4": { + "Amp\\": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniel Lowrey", + "email": "rdlowrey@php.net" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Bob Weinand", + "email": "bobwei9@hotmail.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A non-blocking concurrency framework for PHP applications.", + "homepage": "https://amphp.org/amp", + "keywords": [ + "async", + "asynchronous", + "awaitable", + "concurrency", + "event", + "event-loop", + "future", + "non-blocking", + "promise" + ], + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/amp/issues", + "source": "https://github.com/amphp/amp/tree/v2.6.2" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2022-02-20T17:52:18+00:00" + }, + { + "name": "amphp/byte-stream", + "version": "v1.8.1", + "source": { + "type": "git", + "url": "https://github.com/amphp/byte-stream.git", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "shasum": "" + }, + "require": { + "amphp/amp": "^2", + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1.4", + "friendsofphp/php-cs-fixer": "^2.3", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^6 || ^7 || ^8", + "psalm/phar": "^3.11.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "files": [ + "lib/functions.php" + ], + "psr-4": { + "Amp\\ByteStream\\": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A stream abstraction to make working with non-blocking I/O simple.", + "homepage": "http://amphp.org/byte-stream", + "keywords": [ + "amp", + "amphp", + "async", + "io", + "non-blocking", + "stream" + ], + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/byte-stream/issues", + "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2021-03-30T17:13:30+00:00" + }, + { + "name": "composer/ca-bundle", + "version": "1.3.5", + "source": { + "type": "git", + "url": "https://github.com/composer/ca-bundle.git", + "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/74780ccf8c19d6acb8d65c5f39cd72110e132bbd", + "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "ext-pcre": "*", + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.55", + "psr/log": "^1.0", + "symfony/phpunit-bridge": "^4.2 || ^5", + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\CaBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", + "keywords": [ + "cabundle", + "cacert", + "certificate", + "ssl", + "tls" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/ca-bundle/issues", + "source": "https://github.com/composer/ca-bundle/tree/1.3.5" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2023-01-11T08:27:00+00:00" + }, + { + "name": "composer/composer", + "version": "2.3.10", + "source": { + "type": "git", + "url": "https://github.com/composer/composer.git", + "reference": "ebac357c0a41359f3981098729042ed6dedc97ba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/composer/zipball/ebac357c0a41359f3981098729042ed6dedc97ba", + "reference": "ebac357c0a41359f3981098729042ed6dedc97ba", + "shasum": "" + }, + "require": { + "composer/ca-bundle": "^1.0", + "composer/metadata-minifier": "^1.0", + "composer/pcre": "^2 || ^3", + "composer/semver": "^3.0", + "composer/spdx-licenses": "^1.2", + "composer/xdebug-handler": "^2.0.2 || ^3.0.3", + "justinrainbow/json-schema": "^5.2.11", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "react/promise": "^2.8", + "seld/jsonlint": "^1.4", + "seld/phar-utils": "^1.2", + "symfony/console": "^5.4.7 || ^6.0.7", + "symfony/filesystem": "^5.4 || ^6.0", + "symfony/finder": "^5.4 || ^6.0", + "symfony/polyfill-php73": "^1.24", + "symfony/polyfill-php80": "^1.24", + "symfony/process": "^5.4 || ^6.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.4.1", + "phpstan/phpstan-deprecation-rules": "^1", + "phpstan/phpstan-phpunit": "^1.0", + "phpstan/phpstan-strict-rules": "^1", + "phpstan/phpstan-symfony": "^1.1", + "symfony/phpunit-bridge": "^6.0" + }, + "suggest": { + "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", + "ext-zip": "Enabling the zip extension allows you to unzip archives", + "ext-zlib": "Allow gzip compression of HTTP requests" + }, + "bin": [ + "bin/composer" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.3-dev" + }, + "phpstan": { + "includes": [ + "phpstan/rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Composer\\": "src/Composer" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "https://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.", + "homepage": "https://getcomposer.org/", + "keywords": [ + "autoload", + "dependency", + "package" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/composer/issues", + "source": "https://github.com/composer/composer/tree/2.3.10" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-07-13T13:48:23+00:00" + }, + { + "name": "composer/metadata-minifier", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/metadata-minifier.git", + "reference": "c549d23829536f0d0e984aaabbf02af91f443207" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/metadata-minifier/zipball/c549d23829536f0d0e984aaabbf02af91f443207", + "reference": "c549d23829536f0d0e984aaabbf02af91f443207", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "composer/composer": "^2", + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\MetadataMinifier\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Small utility library that handles metadata minification and expansion.", + "keywords": [ + "composer", + "compression" + ], + "support": { + "issues": "https://github.com/composer/metadata-minifier/issues", + "source": "https://github.com/composer/metadata-minifier/tree/1.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-04-07T13:37:33+00:00" + }, + { + "name": "composer/package-versions-deprecated", + "version": "1.11.99.5", + "source": { + "type": "git", + "url": "https://github.com/composer/package-versions-deprecated.git", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1.0 || ^2.0", + "php": "^7 || ^8" + }, + "replace": { + "ocramius/package-versions": "1.11.99" + }, + "require-dev": { + "composer/composer": "^1.9.3 || ^2.0@dev", + "ext-zip": "^1.13", + "phpunit/phpunit": "^6.5 || ^7" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "support": { + "issues": "https://github.com/composer/package-versions-deprecated/issues", + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-01-17T14:14:24+00:00" + }, { "name": "composer/pcre", "version": "3.1.0", @@ -11879,6 +12373,86 @@ ], "time": "2022-04-01T19:23:25+00:00" }, + { + "name": "composer/spdx-licenses", + "version": "1.5.7", + "source": { + "type": "git", + "url": "https://github.com/composer/spdx-licenses.git", + "reference": "c848241796da2abf65837d51dce1fae55a960149" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/c848241796da2abf65837d51dce1fae55a960149", + "reference": "c848241796da2abf65837d51dce1fae55a960149", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Spdx\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "SPDX licenses list and validation library.", + "keywords": [ + "license", + "spdx", + "validator" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/spdx-licenses/issues", + "source": "https://github.com/composer/spdx-licenses/tree/1.5.7" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-05-23T07:37:50+00:00" + }, { "name": "composer/xdebug-handler", "version": "3.0.3", @@ -12023,6 +12597,43 @@ }, "time": "2023-01-05T11:28:13+00:00" }, + { + "name": "dnoegel/php-xdg-base-dir", + "version": "v0.1.1", + "source": { + "type": "git", + "url": "https://github.com/dnoegel/php-xdg-base-dir.git", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" + }, + "type": "library", + "autoload": { + "psr-4": { + "XdgBaseDir\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "implementation of xdg base directory specification for php", + "support": { + "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", + "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" + }, + "time": "2019-12-04T15:06:13+00:00" + }, { "name": "fakerphp/faker", "version": "v1.20.0", @@ -12090,6 +12701,168 @@ }, "time": "2022-07-20T13:12:54+00:00" }, + { + "name": "felixfbecker/advanced-json-rpc", + "version": "v3.2.1", + "source": { + "type": "git", + "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "shasum": "" + }, + "require": { + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", + "php": "^7.1 || ^8.0", + "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "AdvancedJsonRpc\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Felix Becker", + "email": "felix.b@outlook.com" + } + ], + "description": "A more advanced JSONRPC implementation", + "support": { + "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues", + "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1" + }, + "time": "2021-06-11T22:34:44+00:00" + }, + { + "name": "felixfbecker/language-server-protocol", + "version": "v1.5.2", + "source": { + "type": "git", + "url": "https://github.com/felixfbecker/php-language-server-protocol.git", + "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842", + "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpstan/phpstan": "*", + "squizlabs/php_codesniffer": "^3.1", + "vimeo/psalm": "^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "LanguageServerProtocol\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Felix Becker", + "email": "felix.b@outlook.com" + } + ], + "description": "PHP classes for the Language Server Protocol", + "keywords": [ + "language", + "microsoft", + "php", + "server" + ], + "support": { + "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", + "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2" + }, + "time": "2022-03-02T22:36:06+00:00" + }, + { + "name": "fidry/cpu-core-counter", + "version": "0.4.1", + "source": { + "type": "git", + "url": "https://github.com/theofidry/cpu-core-counter.git", + "reference": "79261cc280aded96d098e1b0e0ba0c4881b432c2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/79261cc280aded96d098e1b0e0ba0c4881b432c2", + "reference": "79261cc280aded96d098e1b0e0ba0c4881b432c2", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "fidry/makefile": "^0.2.0", + "phpstan/extension-installer": "^1.2.0", + "phpstan/phpstan": "^1.9.2", + "phpstan/phpstan-deprecation-rules": "^1.0.0", + "phpstan/phpstan-phpunit": "^1.2.2", + "phpstan/phpstan-strict-rules": "^1.4.4", + "phpunit/phpunit": "^9.5.26 || ^8.5.31", + "theofidry/php-cs-fixer-config": "^1.0", + "webmozarts/strict-phpunit": "^7.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Fidry\\CpuCoreCounter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Théo FIDRY", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Tiny utility to get the number of CPU cores.", + "keywords": [ + "CPU", + "core" + ], + "support": { + "issues": "https://github.com/theofidry/cpu-core-counter/issues", + "source": "https://github.com/theofidry/cpu-core-counter/tree/0.4.1" + }, + "funding": [ + { + "url": "https://github.com/theofidry", + "type": "github" + } + ], + "time": "2022-12-16T22:01:02+00:00" + }, { "name": "friendsofphp/php-cs-fixer", "version": "v3.13.2", @@ -12586,6 +13359,155 @@ ], "time": "2022-03-03T13:19:32+00:00" }, + { + "name": "netresearch/jsonmapper", + "version": "v4.1.0", + "source": { + "type": "git", + "url": "https://github.com/cweiske/jsonmapper.git", + "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "squizlabs/php_codesniffer": "~3.5" + }, + "type": "library", + "autoload": { + "psr-0": { + "JsonMapper": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "OSL-3.0" + ], + "authors": [ + { + "name": "Christian Weiske", + "email": "cweiske@cweiske.de", + "homepage": "http://github.com/cweiske/jsonmapper/", + "role": "Developer" + } + ], + "description": "Map nested JSON structures onto PHP classes", + "support": { + "email": "cweiske@cweiske.de", + "issues": "https://github.com/cweiske/jsonmapper/issues", + "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0" + }, + "time": "2022-12-08T20:46:14+00:00" + }, + { + "name": "nunomaduro/larastan", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/nunomaduro/larastan.git", + "reference": "769bc6346a6cce3b823c30eaace33d9c3a0dd40e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/769bc6346a6cce3b823c30eaace33d9c3a0dd40e", + "reference": "769bc6346a6cce3b823c30eaace33d9c3a0dd40e", + "shasum": "" + }, + "require": { + "composer/composer": "^1.0 || ^2.0", + "ext-json": "*", + "illuminate/console": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/container": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/contracts": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/http": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/pipeline": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "mockery/mockery": "^0.9 || ^1.0", + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.0 <1.9", + "symfony/process": "^4.3 || ^5.0 || ^6.0" + }, + "require-dev": { + "nikic/php-parser": "^4.13.0", + "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0", + "phpunit/phpunit": "^7.3 || ^8.2 || ^9.3" + }, + "suggest": { + "orchestra/testbench": "Using Larastan for analysing a package needs Testbench" + }, + "type": "phpstan-extension", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] + } + }, + "autoload": { + "psr-4": { + "NunoMaduro\\Larastan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" + } + ], + "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel", + "keywords": [ + "PHPStan", + "code analyse", + "code analysis", + "larastan", + "laravel", + "package", + "php", + "static analysis" + ], + "support": { + "issues": "https://github.com/nunomaduro/larastan/issues", + "source": "https://github.com/nunomaduro/larastan/tree/1.0.4" + }, + "funding": [ + { + "url": "https://www.paypal.com/paypalme/enunomaduro", + "type": "custom" + }, + { + "url": "https://github.com/canvural", + "type": "github" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + }, + { + "url": "https://www.patreon.com/nunomaduro", + "type": "patreon" + } + ], + "time": "2022-11-09T09:09:31+00:00" + }, { "name": "nunomaduro/phpinsights", "version": "v2.7.0", @@ -13031,6 +13953,65 @@ }, "time": "2022-12-20T20:56:55+00:00" }, + { + "name": "phpstan/phpstan", + "version": "1.8.11", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "46e223dd68a620da18855c23046ddb00940b4014" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46e223dd68a620da18855c23046ddb00940b4014", + "reference": "46e223dd68a620da18855c23046ddb00940b4014", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "issues": "https://github.com/phpstan/phpstan/issues", + "source": "https://github.com/phpstan/phpstan/tree/1.8.11" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2022-10-24T15:45:13+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "9.2.15", @@ -13511,6 +14492,82 @@ ], "time": "2022-06-19T12:14:25+00:00" }, + { + "name": "react/promise", + "version": "v2.9.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/promise.git", + "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910", + "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "React\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "keywords": [ + "promise", + "promises" + ], + "support": { + "issues": "https://github.com/reactphp/promise/issues", + "source": "https://github.com/reactphp/promise/tree/v2.9.0" + }, + "funding": [ + { + "url": "https://github.com/WyriHaximus", + "type": "github" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], + "time": "2022-02-11T10:27:51+00:00" + }, { "name": "sebastian/cli-parser", "version": "1.0.1", @@ -14195,6 +15252,118 @@ ], "time": "2020-09-28T06:39:44+00:00" }, + { + "name": "seld/jsonlint", + "version": "1.9.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/jsonlint.git", + "reference": "4211420d25eba80712bff236a98960ef68b866b7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4211420d25eba80712bff236a98960ef68b866b7", + "reference": "4211420d25eba80712bff236a98960ef68b866b7", + "shasum": "" + }, + "require": { + "php": "^5.3 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.5", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13" + }, + "bin": [ + "bin/jsonlint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Seld\\JsonLint\\": "src/Seld/JsonLint/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "JSON Linter", + "keywords": [ + "json", + "linter", + "parser", + "validator" + ], + "support": { + "issues": "https://github.com/Seldaek/jsonlint/issues", + "source": "https://github.com/Seldaek/jsonlint/tree/1.9.0" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" + } + ], + "time": "2022-04-01T13:37:23+00:00" + }, + { + "name": "seld/phar-utils", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/phar-utils.git", + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\PharUtils\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "PHAR file format utilities, for when PHP phars you up", + "keywords": [ + "phar" + ], + "support": { + "issues": "https://github.com/Seldaek/phar-utils/issues", + "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1" + }, + "time": "2022-08-31T10:31:18+00:00" + }, { "name": "slevomat/coding-standard", "version": "8.8.0", @@ -14260,6 +15429,70 @@ ], "time": "2023-01-09T10:46:13+00:00" }, + { + "name": "spatie/array-to-xml", + "version": "2.17.1", + "source": { + "type": "git", + "url": "https://github.com/spatie/array-to-xml.git", + "reference": "5cbec9c6ab17e320c58a259f0cebe88bde4a7c46" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/5cbec9c6ab17e320c58a259f0cebe88bde4a7c46", + "reference": "5cbec9c6ab17e320c58a259f0cebe88bde4a7c46", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "php": "^7.4|^8.0" + }, + "require-dev": { + "mockery/mockery": "^1.2", + "pestphp/pest": "^1.21", + "phpunit/phpunit": "^9.0", + "spatie/pest-plugin-snapshots": "^1.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\ArrayToXml\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://freek.dev", + "role": "Developer" + } + ], + "description": "Convert an array to xml", + "homepage": "https://github.com/spatie/array-to-xml", + "keywords": [ + "array", + "convert", + "xml" + ], + "support": { + "source": "https://github.com/spatie/array-to-xml/tree/2.17.1" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + }, + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2022-12-26T08:22:07+00:00" + }, { "name": "symfony/cache", "version": "v5.4.19", @@ -14985,6 +16218,110 @@ } ], "time": "2021-07-28T10:34:58+00:00" + }, + { + "name": "vimeo/psalm", + "version": "5.6.0", + "source": { + "type": "git", + "url": "https://github.com/vimeo/psalm.git", + "reference": "e784128902dfe01d489c4123d69918a9f3c1eac5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/e784128902dfe01d489c4123d69918a9f3c1eac5", + "reference": "e784128902dfe01d489c4123d69918a9f3c1eac5", + "shasum": "" + }, + "require": { + "amphp/amp": "^2.4.2", + "amphp/byte-stream": "^1.5", + "composer/package-versions-deprecated": "^1.10.0", + "composer/semver": "^1.4 || ^2.0 || ^3.0", + "composer/xdebug-handler": "^2.0 || ^3.0", + "dnoegel/php-xdg-base-dir": "^0.1.1", + "ext-ctype": "*", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-simplexml": "*", + "ext-tokenizer": "*", + "felixfbecker/advanced-json-rpc": "^3.1", + "felixfbecker/language-server-protocol": "^1.5.2", + "fidry/cpu-core-counter": "^0.4.0", + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", + "nikic/php-parser": "^4.13", + "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "sebastian/diff": "^4.0 || ^5.0", + "spatie/array-to-xml": "^2.17.0", + "symfony/console": "^4.1.6 || ^5.0 || ^6.0", + "symfony/filesystem": "^5.4 || ^6.0" + }, + "provide": { + "psalm/psalm": "self.version" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4", + "brianium/paratest": "^6.0", + "ext-curl": "*", + "mockery/mockery": "^1.5", + "nunomaduro/mock-final-classes": "^1.1", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/phpdoc-parser": "^1.6", + "phpunit/phpunit": "^9.5", + "psalm/plugin-mockery": "^1.1", + "psalm/plugin-phpunit": "^0.18", + "slevomat/coding-standard": "^8.4", + "squizlabs/php_codesniffer": "^3.6", + "symfony/process": "^4.4 || ^5.0 || ^6.0" + }, + "suggest": { + "ext-curl": "In order to send data to shepherd", + "ext-igbinary": "^2.0.5 is required, used to serialize caching data" + }, + "bin": [ + "psalm", + "psalm-language-server", + "psalm-plugin", + "psalm-refactor", + "psalter" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.x-dev", + "dev-4.x": "4.x-dev", + "dev-3.x": "3.x-dev", + "dev-2.x": "2.x-dev", + "dev-1.x": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psalm\\": "src/Psalm/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Brown" + } + ], + "description": "A static analysis tool for finding errors in PHP applications", + "keywords": [ + "code", + "inspection", + "php" + ], + "support": { + "issues": "https://github.com/vimeo/psalm/issues", + "source": "https://github.com/vimeo/psalm/tree/5.6.0" + }, + "time": "2023-01-23T20:32:47+00:00" } ], "aliases": [], From dd5f256450ee5c22a088dcba678bfc1e917b195d Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 Feb 2023 11:02:02 -0800 Subject: [PATCH 106/159] =?UTF-8?q?We=20shouldn=E2=80=99t=20need=20this=20?= =?UTF-8?q?because=20aliases=3F=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- app/Http/Transformers/AssetModelsTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php index d694ac5b49..5725e55930 100644 --- a/app/Http/Transformers/AssetModelsTransformer.php +++ b/app/Http/Transformers/AssetModelsTransformer.php @@ -4,7 +4,7 @@ namespace App\Http\Transformers; use App\Helpers\Helper; use App\Models\AssetModel; -use Gate; +use Illuminate\Support\Facades\Gate; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Facades\Storage; From ea644f8d47b2ef0bc174652557bc3758745b8980 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 Feb 2023 11:02:20 -0800 Subject: [PATCH 107/159] Still throwing errors, but trying to fix the docblock Signed-off-by: snipe --- app/Console/Commands/CreateAdmin.php | 29 +++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdmin.php index a4b4b9e42c..5aebde3777 100644 --- a/app/Console/Commands/CreateAdmin.php +++ b/app/Console/Commands/CreateAdmin.php @@ -3,14 +3,29 @@ namespace App\Console\Commands; use Illuminate\Console\Command; +use \App\Models\User; + class CreateAdmin extends Command { + + /** @mixin User **/ /** - * The name and signature of the console command. - * - * @var string + * App\Console\CreateAdmin + * @property mixed $first_name + * @property string $last_name + * @property string $username + * @property string $email + * @property string $permissions + * @property string $password + * @property boolean $activated + * @property boolean $show_in_list + * @property \Illuminate\Support\Carbon|null $created_at + * @property mixed $created_by */ + + + protected $signature = 'snipeit:create-admin {--first_name=} {--last_name=} {--email=} {--username=} {--password=} {show_in_list?}'; /** @@ -30,11 +45,7 @@ class CreateAdmin extends Command parent::__construct(); } - /** - * Execute the console command. - * - * @return mixed - */ + public function handle() { $first_name = $this->option('first_name'); @@ -47,7 +58,7 @@ class CreateAdmin extends Command if (($first_name == '') || ($last_name == '') || ($username == '') || ($email == '') || ($password == '')) { $this->info('ERROR: All fields are required.'); } else { - $user = new \App\Models\User; + $user = new User; $user->first_name = $first_name; $user->last_name = $last_name; $user->username = $username; From efac2259db667771aee7b6672e721a4d713c6ca8 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 7 Feb 2023 12:25:13 -0800 Subject: [PATCH 108/159] Include Larastan configuration file --- phpstan.neon | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpstan.neon b/phpstan.neon index 12cdbff72a..951c00ff30 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,3 +1,6 @@ +includes: + - ./vendor/nunomaduro/larastan/extension.neon + parameters: paths: - app From e4cf59c0344a56bdae5d4476af3114d705c2829b Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 7 Feb 2023 12:46:13 -0800 Subject: [PATCH 109/159] Sort paths --- phpstan.neon | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 951c00ff30..9720523dac 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -4,10 +4,11 @@ includes: parameters: paths: - app - - resources/views - - resources/lang - - database/migrations - config + - database/migrations + - resources/lang + - resources/views + level: 4 From fd524c5f14f3fdd202a7d3ad2cba5b383b751c49 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 7 Feb 2023 12:48:41 -0800 Subject: [PATCH 110/159] Remove ignore errors section covered by larastan config --- phpstan.neon | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 9720523dac..d5edda6884 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -9,18 +9,4 @@ parameters: - resources/lang - resources/views - level: 4 - - ignoreErrors: - - '#Class, interface or enum named #' - - '#Call to an undefined static method App\\Models\\.*::where.*\(\)#' - - '#Call to an undefined static method App\\Models\\.*::firstOr.*\(\)#' - - '#Call to an undefined static method App\\Models\\.*::find.*\(\)#' - - '#Call to an undefined static method App\\Models\\.*::get.*\(\)#' - - '#Call to an undefined static method App\\Models\\.*::has.*\(\)#' - - '#Call to static method info\(\) on an unknown class Log#' - - '#Call to static method debug\(\) on an unknown class Log#' - - '#Call to static method getSchemaBuilder\(\) on an unknown class DB#' - - '#Call to static method call\(\) on an unknown class Artisan.#' - From c1d484b5df0b08598ffd50b4fe94f81a269471cb Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 Feb 2023 13:31:50 -0800 Subject: [PATCH 111/159] Fixed mismatched field/fieldset Signed-off-by: snipe --- app/Http/Controllers/CustomFieldsetsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php index 8128b3369f..8c14502285 100644 --- a/app/Http/Controllers/CustomFieldsetsController.php +++ b/app/Http/Controllers/CustomFieldsetsController.php @@ -169,7 +169,7 @@ class CustomFieldsetsController extends Controller */ public function destroy($id) { - $fieldset = CustomField::find($id); + $fieldset = CustomFieldset::find($id); $this->authorize('delete', $fieldset); From 321a34a9d3b5fb19505d7aec197e10fbcf60e1fa Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 7 Feb 2023 13:32:32 -0800 Subject: [PATCH 112/159] Make phpstan configuration more flexible --- .gitignore | 1 + phpstan.neon => phpstan.neon.dist | 0 phpstan.neon.example | 8 ++++++++ 3 files changed, 9 insertions(+) rename phpstan.neon => phpstan.neon.dist (100%) create mode 100644 phpstan.neon.example diff --git a/.gitignore b/.gitignore index 078a7e4b8a..e49e69c9ae 100755 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .env .env.dusk.* !.env.dusk.example +phpstan.neon .idea /bin/ /bootstrap/compiled.php diff --git a/phpstan.neon b/phpstan.neon.dist similarity index 100% rename from phpstan.neon rename to phpstan.neon.dist diff --git a/phpstan.neon.example b/phpstan.neon.example new file mode 100644 index 0000000000..a9bc1a30de --- /dev/null +++ b/phpstan.neon.example @@ -0,0 +1,8 @@ +# Copy this file to "phpstan.neon" and update the parameters section as needed + +includes: + - phpstan.neon.dist + +parameters: + # https://phpstan.org/user-guide/output-format#opening-file-in-an-editor + editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%' From c0074baa266ae0bb15d81e7b9dc62757eef8200d Mon Sep 17 00:00:00 2001 From: akemidx Date: Tue, 7 Feb 2023 17:27:39 -0500 Subject: [PATCH 113/159] functionality to Apple Warranty link --- resources/views/hardware/view.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index b4cd6d4988..d8adad00d8 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -595,10 +595,12 @@ {{ $asset->warranty_months }} {{ trans('admin/hardware/form.months') }} - @if (($asset->serial && $asset->model->manufacturer) && $asset->model->manufacturer->name == 'Apple') + @if ($asset->serial) + @if ((strtolower($asset->model->manufacturer->name) == "apple") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"appleinc"))) + @endif @endif
    From 75f3cb30790d6140cbd8a8fb34b6193134849d16 Mon Sep 17 00:00:00 2001 From: akemidx Date: Tue, 7 Feb 2023 19:02:12 -0500 Subject: [PATCH 114/159] fixing external if statement --- resources/views/hardware/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index d8adad00d8..933392d8e9 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -595,7 +595,7 @@ {{ $asset->warranty_months }} {{ trans('admin/hardware/form.months') }} - @if ($asset->serial) + @if ($asset->serial && $asset->model->manufacturer) @if ((strtolower($asset->model->manufacturer->name) == "apple") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"appleinc"))) From 49b6a1cc5374f6990b32e78fab13344afe3de4e9 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Tue, 7 Feb 2023 18:29:19 -0600 Subject: [PATCH 115/159] Adds translation strings to theinventory report sent to users --- app/Notifications/CurrentInventory.php | 2 +- resources/lang/en/mail.php | 2 ++ resources/views/vendor/notifications/email.blade.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Notifications/CurrentInventory.php b/app/Notifications/CurrentInventory.php index d0161aa165..158955b273 100644 --- a/app/Notifications/CurrentInventory.php +++ b/app/Notifications/CurrentInventory.php @@ -44,7 +44,7 @@ class CurrentInventory extends Notification 'accessories' => $this->user->accessories, 'licenses' => $this->user->licenses, ]) - ->subject('Inventory Report'); + ->subject(trans('mail.inventory_report')); return $message; } diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php index b0ae7de76b..6bf36b4ebf 100644 --- a/resources/lang/en/mail.php +++ b/resources/lang/en/mail.php @@ -43,6 +43,7 @@ return [ 'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:', 'login' => 'Login:', 'Low_Inventory_Report' => 'Low Inventory Report', + 'inventory_report' => 'Inventory Report', 'min_QTY' => 'Min QTY', 'name' => 'Name', 'new_item_checked' => 'A new item has been checked out under your name, details are below.', @@ -79,4 +80,5 @@ return [ 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', 'your_assets' => 'View Your Assets', + 'rights_reserved' => 'All rights reserved.', ]; diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php index 0147ef40d7..f25cfcec8c 100644 --- a/resources/views/vendor/notifications/email.blade.php +++ b/resources/views/vendor/notifications/email.blade.php @@ -204,7 +204,7 @@ $style = [

    © {{ date('Y') }} {{ $snipeSettings->site_name }}. - All rights reserved. + {{ trans('mail.rights_reserved') }}

    @if ($snipeSettings->privacy_policy_link!='') From 16fcc6dc444b20c28aab9432f2ba620a69f38978 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 Feb 2023 18:40:00 -0800 Subject: [PATCH 116/159] Fixed UI bug where download button was missing for non-images Signed-off-by: snipe --- resources/lang/en/general.php | 1 + resources/views/users/view.blade.php | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index a2c7e367d9..e071124a05 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -396,6 +396,7 @@ return [ 'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail', 'placeholder_kit' => 'Select a kit', 'file_not_found' => 'File not found', + 'preview_not_available' => '(no preview)', diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 3fb3b9a58c..cd9757854a 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -868,13 +868,15 @@ - @if ($file->filename) - @if ((Storage::exists('private_uploads/users/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('users')))) + @if (($file->filename) && (Storage::exists('private_uploads/users/'.$file->filename))) + @if (Helper::checkUploadIsImage($file->get_src('users'))) @else - - {{ trans('general.file_not_found') }} + {{ trans('general.preview_not_available') }} @endif + @else + + {{ trans('general.file_not_found') }} @endif @@ -891,7 +893,7 @@ @if ($file->filename) - @if ((Storage::exists('private_uploads/users/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('users')))) + @if (Storage::exists('private_uploads/users/'.$file->filename)) {{ trans('general.download') }} From 5962f1b6271713e8157ddea158188cf15d4eb938 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 8 Feb 2023 12:21:51 -0800 Subject: [PATCH 117/159] Catch json encoding exceptions and display them to the user --- app/Http/Controllers/Api/ImportController.php | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php index 9742cc1644..15f46f2df8 100644 --- a/app/Http/Controllers/Api/ImportController.php +++ b/app/Http/Controllers/Api/ImportController.php @@ -10,6 +10,7 @@ use App\Models\Asset; use App\Models\Company; use App\Models\Import; use Artisan; +use Illuminate\Database\Eloquent\JsonEncodingException; use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Storage; @@ -64,7 +65,18 @@ class ImportController extends Controller ini_set('auto_detect_line_endings', '1'); } $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak? - $import->header_row = $reader->fetchOne(0); + + try { + $import->header_row = $reader->fetchOne(0); + } catch (JsonEncodingException $e) { + return response()->json( + Helper::formatStandardApiResponse( + 'error', + null, + 'One or more attributes in the header row contain malformed UTF-8 characters'), + 500 + ); + } //duplicate headers check $duplicate_headers = []; @@ -85,8 +97,18 @@ class ImportController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)), 500); //should this be '4xx'? } - // Grab the first row to display via ajax as the user picks fields - $import->first_row = $reader->fetchOne(1); + try { + // Grab the first row to display via ajax as the user picks fields + $import->first_row = $reader->fetchOne(1); + } catch (JsonEncodingException $e) { + return response()->json( + Helper::formatStandardApiResponse( + 'error', + null, + 'One or more attributes in row 2 contain malformed UTF-8 characters'), + 500 + ); + } $date = date('Y-m-d-his'); $fixed_filename = str_slug($file->getClientOriginalName()); From c2c666aef09e995de739919a6a87423961e4a70b Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 8 Feb 2023 12:32:57 -0800 Subject: [PATCH 118/159] Formatting --- app/Http/Controllers/Api/ImportController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php index 15f46f2df8..54ebea6ba5 100644 --- a/app/Http/Controllers/Api/ImportController.php +++ b/app/Http/Controllers/Api/ImportController.php @@ -73,7 +73,8 @@ class ImportController extends Controller Helper::formatStandardApiResponse( 'error', null, - 'One or more attributes in the header row contain malformed UTF-8 characters'), + 'One or more attributes in the header row contain malformed UTF-8 characters' + ), 500 ); } @@ -105,7 +106,8 @@ class ImportController extends Controller Helper::formatStandardApiResponse( 'error', null, - 'One or more attributes in row 2 contain malformed UTF-8 characters'), + 'One or more attributes in row 2 contain malformed UTF-8 characters' + ), 500 ); } From b3881a43a7963831677c364828e1e4633ba4aa8d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 8 Feb 2023 12:34:25 -0800 Subject: [PATCH 119/159] Fix return type --- app/Http/Controllers/Api/ImportController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php index 54ebea6ba5..d76decfc53 100644 --- a/app/Http/Controllers/Api/ImportController.php +++ b/app/Http/Controllers/Api/ImportController.php @@ -36,7 +36,7 @@ class ImportController extends Controller * Process and store a CSV upload file. * * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\JsonResponse */ public function store() { @@ -132,9 +132,9 @@ class ImportController extends Controller } $results = (new ImportsTransformer)->transformImports($results); - return [ + return response()->json([ 'files' => $results, - ]; + ]); } return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 500); From 73f355f3a8036e4d3d6227656616db44878dadff Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 8 Feb 2023 12:39:42 -0800 Subject: [PATCH 120/159] Return 422 instead of 500 when import is invalid --- app/Http/Controllers/Api/ImportController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php index d76decfc53..9820b9ca0b 100644 --- a/app/Http/Controllers/Api/ImportController.php +++ b/app/Http/Controllers/Api/ImportController.php @@ -57,7 +57,7 @@ class ImportController extends Controller 'text/tsv', ])) { $results['error'] = 'File type must be CSV. Uploaded file is '.$file->getMimeType(); - return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 500); + return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 422); } //TODO: is there a lighter way to do this? @@ -75,7 +75,7 @@ class ImportController extends Controller null, 'One or more attributes in the header row contain malformed UTF-8 characters' ), - 500 + 422 ); } @@ -95,7 +95,7 @@ class ImportController extends Controller } } if (count($duplicate_headers) > 0) { - return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)), 500); //should this be '4xx'? + return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)),422); } try { @@ -108,7 +108,7 @@ class ImportController extends Controller null, 'One or more attributes in row 2 contain malformed UTF-8 characters' ), - 500 + 422 ); } @@ -137,7 +137,7 @@ class ImportController extends Controller ]); } - return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 500); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 422); } /** From 1a651b33fc46fb2a8879b2b867856188189aae10 Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 8 Feb 2023 17:31:39 -0500 Subject: [PATCH 121/159] manufacturer marker removal --- resources/views/modals/model.blade.php | 12 ++++++------ resources/views/models/edit.blade.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php index 6fc0359c81..519767f304 100644 --- a/resources/views/modals/model.blade.php +++ b/resources/views/modals/model.blade.php @@ -16,17 +16,17 @@
    -
    +
    - +
    -
    -
    - +
    +
    +
    diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php index f7ec2796b6..a643ee2fe2 100755 --- a/resources/views/models/edit.blade.php +++ b/resources/views/models/edit.blade.php @@ -11,8 +11,8 @@ @section('inputFields') @include ('partials.forms.edit.name', ['translated_name' => trans('admin/models/table.name'), 'required' => 'true']) -@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true']) @include ('partials.forms.edit.category-select', ['translated_name' => trans('admin/categories/general.category_name'), 'fieldname' => 'category_id', 'required' => 'true', 'category_type' => 'asset']) +@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id']) @include ('partials.forms.edit.model_number') @include ('partials.forms.edit.depreciation') From 32ed70259e26a7f00b0ebccf35ccdc15b432be10 Mon Sep 17 00:00:00 2001 From: akemidx Date: Thu, 9 Feb 2023 15:39:10 -0500 Subject: [PATCH 122/159] sweedish chef fixes up your typos --- resources/views/modals/model.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php index 519767f304..360d14ce32 100644 --- a/resources/views/modals/model.blade.php +++ b/resources/views/modals/model.blade.php @@ -26,7 +26,7 @@
    - +
    From 5714824aa77e6a2955f7b5882c24148634960a71 Mon Sep 17 00:00:00 2001 From: akemidx Date: Thu, 9 Feb 2023 17:24:34 -0500 Subject: [PATCH 123/159] translations for the layout setup --- resources/lang/en/general.php | 6 ++++++ resources/views/layouts/default.blade.php | 9 +++++---- resources/views/layouts/setup.blade.php | 5 +++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index e071124a05..cc7ee7fa1c 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -397,6 +397,12 @@ return [ 'placeholder_kit' => 'Select a kit', 'file_not_found' => 'File not found', 'preview_not_available' => '(no preview)', + 'setup' => 'Setup', + 'pre_flight' => 'Pre-Flight', + 'skip_to_main_content' => 'Skip to main content', + 'toggle_navigation' => 'Toggle navigation', + 'alerts' => 'Alerts', + 'tasks_view_all' => 'View all tasks', diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index ceabe13553..2bb9bc8cf9 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -88,7 +88,7 @@ @endif -     Skip to main content + {{ trans('general.skip_to_main_content') }}
    @@ -100,7 +100,7 @@