snipe / snipe-it

A free open source IT asset/license management system
https://snipeitapp.com
GNU Affero General Public License v3.0
11.03k stars 3.18k forks source link

Version number not updating #12183

Closed kwoodVisions closed 1 year ago

kwoodVisions commented 1 year ago

Debug mode

Describe the bug

When upgrading from 5.1.3 to the latest version, the upgrade process goes through successfully without any errors. After clearing browser cache and going to the web portal, the version number on the bottom of the page still shows 5.1.3, not the latest version.

Reproduction steps

Unsure what to explain here -- I ran php upgrade.php as instructed in the upgrade instructions and it went through successfully but the version number on the web page did not update.

Expected behavior

I was expecting the version number of the web portal to update to the latest version number.

Screenshots

No response

Snipe-IT Version

Shows 5.1.3 on the page

Operating System

Ubuntu 18.04

Web Server

apache2

PHP Version

php 7.4

Operating System

No response

Browser

No response

Version

No response

Device

No response

Operating System

No response

Browser

No response

Version

No response

Error messages

No response

Additional context

No response

snipe commented 1 year ago

What was the output of the upgrade.php script when you ran it? If your install is not a git install, it will not be able to download new files, you'll have to do that manually.

kwoodVisions commented 1 year ago

What was the output of the upgrade.php script when you ran it? If your install is not a git install, it will not be able to download new files, you'll have to do that manually.

Unfortunately I cannot scroll back that far in the history of the SSH session to see the upgrade log -- is there a place that it's stored? I know during the upgrade script, everything seemed to run successfully and then I was presented with the standard message at the end stating everything went through successfully and to refresh my browser to see the changes.

I am doing the git upgrade process.

snipe commented 1 year ago

Just run it again and save the output and paste it in here.

snipe commented 1 year ago

(You can run the upgrade.php script as many times as you want, it won't hurt anything.)

kwoodVisions commented 1 year ago

Here's the entire output.... I did notice a few errors after running again. Perhaps you can help me make sense of them?

OUTPUT:

`

WELCOME TO THE SNIPE-IT UPGRADER!

This script will attempt to:


STEP 1: Checking PHP requirements:

Current PHP version: (7.4.33) is at least 7.2.5 - continuing... FYI: The php.ini used by this PHP is: /etc/php/7.4/cli/php.ini

Checking Required PHP extensions...

√ bcmath is installed! √ curl is installed! √ fileinfo is installed! √ gd is installed! √ json is installed! √ ldap is installed! √ mbstring is installed! √ mysqli is installed! √ openssl is installed! √ PDO is installed! √ tokenizer is installed! √ xml is installed! √ zip is installed!


STEP 2: Backing up database:

-- Starting backup... Dumping database snipeit... Determining files to backup... Zipping 502 files and directories... Created zip containing 502 files and directories. Size is 11.78 MB Copying zip to disk named backup... Successfully copied zip to disk named backup. Backup completed!


STEP 3: Putting application into maintenance mode:

-- Application is now in maintenance mode.


STEP 4: Pulling latest from Git (master branch):

Git is installed. fatal: unable to access 'https://github.com/snipe/snipe-it/': Could not resolve host: github.com Already on 'master' fatal: name consists only of disallowed characters: "" Cannot save the current index state remote: Enumerating objects: 79, done. remote: Counting objects: 100% (74/74), done. remote: Compressing objects: 100% (31/31), done. remote: Total 79 (delta 54), reused 53 (delta 43), pack-reused 5 Unpacking objects: 100% (79/79), done. From https://github.com/snipe/snipe-it d2dcb29dc..9c205f63a master -> origin/master 3ef578eb5..0cc7389b8 develop -> origin/develop


Step 5: Cleaning up old cached files:

√ No bootstrap/cache/compiled.php, so nothing to delete. √ No bootsrap/cache/services.php, so nothing to delete. √ Deleting bootstrap/cache/config.php. It is no longer used.

-- Configuration cache cleared! -- Failed to clear cache. Make sure you have the appropriate permissions. -- Route cache cleared! -- Compiled views cleared!


Step 6: Updating composer dependencies: (This may take a moment.)

-- We couldn't find a local composer.phar. No worries, trying globally.

Generating optimized autoload files

Illuminate\Foundation\ComposerScripts::postAutoloadDump Loading composer repositories with package information Installing dependencies from lock file Warning: The lock file is not up to date with the latest changes in composer.json. You may be getting outdated dependencies. Run update to update them. Package operations: 0 installs, 0 updates, 37 removals

  • Removing theseer/tokenizer (1.2.0)
  • Removing symfony/yaml (v5.2.2)
  • Removing symfony/dom-crawler (v4.4.19)
  • Removing symfony/browser-kit (v5.2.2)
  • Removing softcreatr/jsonpath (0.7.2)
  • Removing sebastian/version (2.0.1)
  • Removing sebastian/type (1.1.4)
  • Removing sebastian/resource-operations (2.0.2)
  • Removing sebastian/object-reflector (1.1.2)
  • Removing sebastian/object-enumerator (3.0.4)
  • Removing sebastian/global-state (3.0.1)
  • Removing sebastian/environment (4.2.4)
  • Removing sebastian/code-unit-reverse-lookup (1.0.2)
  • Removing phpunit/phpunit (8.5.14)
  • Removing phpunit/php-token-stream (3.1.2)
  • Removing phpunit/php-timer (2.1.3)
  • Removing phpunit/php-text-template (1.2.1)
  • Removing phpunit/php-file-iterator (2.0.3)
  • Removing phpunit/php-code-coverage (7.0.14)
  • Removing php-webdriver/webdriver (1.9.0)
  • Removing phar-io/version (3.0.4)
  • Removing phar-io/manifest (2.0.1)
  • Removing overtrue/phplint (2.3.5)
  • Removing n98/junit-xml (1.0.0)
  • Removing myclabs/deep-copy (1.10.2)
  • Removing justinrainbow/json-schema (5.2.10)
  • Removing fzaninotto/faker (v1.9.2)
  • Removing codeception/stub (3.7.0)
  • Removing codeception/phpunit-wrapper (8.1.4)
  • Removing codeception/module-webdriver (1.2.0)
  • Removing codeception/module-rest (1.2.7)
  • Removing codeception/module-laravel5 (1.1.1)
  • Removing codeception/module-asserts (1.3.1)
  • Removing codeception/lib-innerbrowser (1.4.0)
  • Removing codeception/lib-asserts (1.13.2)
  • Removing codeception/codeception (4.1.17)
  • Removing behat/gherkin (v4.7.1) Package doctrine/reflection is abandoned, you should avoid using it. Use roave/better-reflection instead. Package patchwork/utf8 is abandoned, you should avoid using it. Use symfony/polyfill-mbstring or symfony/string instead. Generating optimized autoload files Illuminate\Foundation\ComposerScripts::postAutoloadDump

Step 7: Migrating database:

Nothing to migrate.


Step 8: Checking for OAuth keys:

√ OAuth keys detected. Skipping passport install.


Step 9: Taking application out of maintenance mode:

-- Application is now live.

---------------------- FINISHED! ----------------------- All done! Clear your browser cookies and re-login to use your upgraded Snipe-IT!

`

GitHub
GitHub - snipe/snipe-it: A free open source IT asset/license management system
A free open source IT asset/license management system - GitHub - snipe/snipe-it: A free open source IT asset/license management system
GitHub
GitHub - snipe/snipe-it: A free open source IT asset/license management system
A free open source IT asset/license management system - GitHub - snipe/snipe-it: A free open source IT asset/license management system
snipe commented 1 year ago

error: Your local changes to the following files would be overwritten by merge:

In your messages.... this means that something was changed on your end and therefore the new files cannot be downloaded.

Try maybe running git stash before that update and then try the update again. It's possible permissions were changed or something else that's upsetting git. Either way, it doesn't want to overwrite what you have locally because a git pull will overwrite those changes.

fatal: unable to access 'https://github.com/snipe/snipe-it/': Could not resolve host: github.com
Already on 'master'
fatal: name consists only of disallowed characters: ""

Legit not sure what this even means. Maybe you have a weird origin set?

snipe commented 1 year ago

@uberbrady any additional thoughts?

kwoodVisions commented 1 year ago

git stash results in the following error:

snipeitapp@SNIPEIT:/var/www/snipeit$ git stash

fatal: name consists only of disallowed characters: ""

Cannot save the current index state
snipe commented 1 year ago

Ahh, okay - I think you need to edit your git config. Your username is probably blank.

https://stackoverflow.com/questions/46711492/git-commit-error-name-consists-only-of-disallowed-characters

Stack Overflow
git commit error : name consists only of disallowed characters:
create a new git project and only add README.txt when I commit, an error occurred.
kwoodVisions commented 1 year ago

OK, let me check that and I'll get back to you.

Thank you!

kwoodVisions commented 1 year ago

Alright so I ran: git config --global user.name "snipeitapp" and then was able to run git stash.

After running php upgrade.php, had lots of lines stating it was downgrading items. Now, instead of 5.1.3, I'm on v5.0.11.

I ran the command again but nothing seemed to change. Here's the output of the php upgrade.php after doing git stash:

--------------------------------------------------------
WELCOME TO THE SNIPE-IT UPGRADER!
--------------------------------------------------------

This script will attempt to:

- check your PHP version and extension requirements
- do a git pull to bring you to the latest version
- run composer install to get your vendors up to date
- run migrations to get your schema up to date
- clear out old cache settings

--------------------------------------------------------
STEP 1: Checking PHP requirements:
--------------------------------------------------------

Current PHP version: (7.4.33) is at least 7.2.0 - continuing...
FYI: The php.ini used by this PHP is: /etc/php/7.4/cli/php.ini

Checking Required PHP extensions...

√ bcmath is installed!
√ curl is installed!
√ fileinfo is installed!
√ gd is installed!
√ json is installed!
√ ldap is installed!
√ mbstring is installed!
√ mysqli is installed!
√ openssl is installed!
√ PDO is installed!
√ tokenizer is installed!
√ xml is installed!
√ zip is installed!

--------------------------------------------------------
STEP 2: Backing up database:
--------------------------------------------------------

-- Starting backup...
Dumping database snipeit...
Determining files to backup...
Zipping 502 files and directories...
Created zip containing 502 files and directories. Size is 11.78 MB
Copying zip to disk named backup...
Successfully copied zip to disk named backup.
Backup completed!

--------------------------------------------------------
STEP 3: Putting application into maintenance mode:
--------------------------------------------------------

-- Application is now in maintenance mode.

--------------------------------------------------------
STEP 4: Pulling latest from Git (master branch):
--------------------------------------------------------

Git is installed.
^[[28~Already on 'master'                                                                                                                            error: The following untracked working tree files would be overwritten by merge:
        app/Helpers/StorageHelper.php
        app/Http/Controllers/HealthController.php
        app/Http/Middleware/NoSessionStore.php
        app/Policies/PredefinedKitPolicy.php
        database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php
        database/migrations/2020_12_18_090026_swap_target_type_index_order.php
        database/migrations/2020_12_21_153235_update_min_password.php
        database/migrations/2020_12_21_210105_fix_bad_ldap_server_url_for_v5.php
        database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php
        public/img/demo/snipe-logo-bug.png
        resources/views/partials/forms/edit/datepicker.blade.php
Please move or remove them before you merge.
Aborting
-- No local changes to save
-- Your branch is behind 'origin/master' by 3312 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
-- Updating f1d0d1bfe..9c205f63a

--------------------------------------------------------
Step 5: Cleaning up old cached files:
--------------------------------------------------------

√ No bootstrap/cache/compiled.php, so nothing to delete.
√ No bootsrap/cache/services.php, so nothing to delete.
√ No bootstrap/cache/config.php, so nothing to delete.

-- Configuration cache cleared!
-- Failed to clear cache. Make sure you have the appropriate permissions.
-- Route cache cleared!
-- Compiled views cleared!

--------------------------------------------------------
Step 6: Updating composer dependencies:
(This may take a moment.)
--------------------------------------------------------

-- We couldn't find a local composer.phar. No worries, trying globally.

Generating optimized autoload files
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
Loading composer repositories with package information
Installing dependencies from lock file
Package operations: 1 install, 96 updates, 6 removals
  - Removing symfony/polyfill-php80 (v1.22.0)
  - Removing symfony/polyfill-intl-normalizer (v1.22.0)
  - Removing symfony/deprecation-contracts (v2.2.0)
  - Removing league/mime-type-detection (1.7.0)
  - Removing alek13/slack (1.12.0)
  - Removing symfony/http-client-contracts (v2.3.1)
  - Downgrading symfony/polyfill-php72 (v1.22.0 => v1.15.0):  Checking out 37b0976c78
  - Downgrading symfony/polyfill-mbstring (v1.22.0 => v1.15.0):  Checking out 81ffd3a9c6
  - Downgrading symfony/var-dumper (v4.4.19 => v4.4.7):  Checking out 5a0c2d9300
  - Downgrading tightenco/collect (v8.19.0 => v7.6.1):  Checking out 4b6a215656
  - Downgrading symfony/polyfill-ctype (v1.22.0 => v1.15.0):  Checking out 4719fa9c18
  - Downgrading phpoption/phpoption (1.7.5 => 1.7.3):  Checking out 4acfd6a4b3
  - Downgrading vlucas/phpdotenv (v3.6.8 => v3.6.3):  Checking out 1b31030137
  - Downgrading symfony/css-selector (v4.4.19 => v4.4.7):  Checking out afc26133a6
  - Downgrading tijsverkoyen/css-to-inline-styles (2.2.3 => 2.2.2):  Checking out dda2ee426a
  - Downgrading symfony/routing (v4.4.19 => v4.4.7):  Checking out 0f562fa613
  - Downgrading symfony/process (v4.4.19 => v4.4.7):  Checking out 3e40e87a20
  - Downgrading symfony/polyfill-php73 (v1.22.0 => v1.15.0):  Checking out 0f27e9f464
  - Downgrading symfony/polyfill-intl-idn (v1.22.0 => v1.15.0):  Checking out 47bd6aa45b
  - Downgrading symfony/mime (v5.2.2 => v4.4.7):  Checking out 6dde9dc701
  - Downgrading symfony/http-foundation (v4.4.19 => v4.4.7):  Checking out 62f92509c9
  - Downgrading symfony/event-dispatcher-contracts (v1.1.9 => v1.1.7):  Checking out c43ab68567
  - Downgrading symfony/event-dispatcher (v4.4.19 => v4.4.7):  Checking out abc8e3618b
  - Downgrading symfony/debug (v4.4.19 => v4.4.7):  Checking out 346636d2ca
  - Downgrading symfony/error-handler (v4.4.19 => v4.4.7):  Checking out 7e9828fc98
  - Downgrading symfony/http-kernel (v4.4.19 => v4.4.7):  Checking out f356a489e5
  - Downgrading symfony/finder (v4.4.19 => v4.4.7):  Checking out 5729f943f9
  - Downgrading symfony/service-contracts (v2.2.0 => v1.1.8):  Checking out ffc7f56920
  - Downgrading symfony/console (v4.4.19 => v4.4.7):  Checking out 10bb3ee3c9
  - Downgrading symfony/polyfill-iconv (v1.22.0 => v1.15.0):  Checking out ad6d62792b
  - Downgrading doctrine/lexer (1.2.1 => 1.2.0):  Checking out 5242d66dbe
  - Downgrading egulias/email-validator (2.1.25 => 2.1.17):  Checking out ade6887fd9
  - Downgrading swiftmailer/swiftmailer (v6.2.5 => v6.2.3):  Checking out 149cfdf118
  - Downgrading opis/closure (3.6.1 => 3.5.1):  Checking out 93ebc5712c
  - Downgrading symfony/translation-contracts (v2.3.0 => v1.1.7):  Checking out 364518c132
  - Downgrading symfony/translation (v4.4.19 => v4.4.7):  Checking out 4e54d336f2
  - Downgrading nesbot/carbon (2.44.0 => 2.32.2):     The package has modified files:
    M bin/carbon
    Discard changes [y,n,v,d,s,?]? ?
    y - discard changes and apply the update
    n - abort the update and let you manually clean things up
    v - view modified files
    d - view local modifications (diff)
    s - stash changes and try to reapply them after the update
    ? - print help
    Discard changes [y,n,v,d,s,?]? y
 Checking out f10e22cf54
  - Downgrading monolog/monolog (2.2.0 => 2.0.2):  Checking out c861fcba2c
  - Downgrading league/flysystem (1.1.3 => 1.0.67):  Checking out 5b1f36c75c
  - Downgrading league/commonmark (1.5.7 => 1.4.1):  Checking out c995966d35
  - Downgrading dragonmantank/cron-expression (v2.3.1 => v2.3.0):  Checking out 72b6fbf76a
  - Downgrading doctrine/inflector (1.4.3 => 1.3.1):  Checking out ec3a552422
  - Downgrading laravel/framework (v6.20.16 => v6.18.10):  Checking out 9177744ccd
  - Downgrading adldap2/adldap2 (v10.3.1 => v10.2.3):  Checking out 2baffac2df
  - Downgrading maximebf/debugbar (v1.16.5 => v1.16.2):  Checking out 40f375504a
  - Downgrading barryvdh/laravel-debugbar (v3.5.2 => v3.3.2):  Checking out 95c31aab33
  - Downgrading doctrine/annotations (1.11.1 => 1.10.2):  Checking out b9d758e831
  - Downgrading doctrine/reflection (1.2.2 => 1.2.1):  Checking out 55e71912df
  - Downgrading doctrine/event-manager (1.1.1 => 1.1.0):  Checking out 6295728199
  - Downgrading doctrine/collections (1.6.7 => 1.6.4):  Checking out 6b1e4b2b66
  - Downgrading doctrine/cache (1.10.2 => 1.10.0):  Checking out 382e7f4db9
  - Downgrading doctrine/persistence (1.3.8 => 1.3.7):  Checking out 0af483f91b
  - Downgrading doctrine/common (2.13.3 => 2.12.0):  Checking out 2053eafdf6
  - Downgrading doctrine/dbal (2.10.4 => 2.10.2):  Checking out aab745e7b6
  - Downgrading fideloper/proxy (4.4.1 => 4.3.0):  Checking out ec38ad69ee
  - Downgrading guzzlehttp/promises (1.4.0 => v1.3.1):  Checking out a59da6cf61
  - Downgrading guzzlehttp/psr7 (1.7.0 => 1.6.1):  Checking out 239400de7a
  - Downgrading laminas/laminas-zendframework-bridge (1.1.1 => 1.0.3):  Checking out bfbbdb6c99
  - Downgrading laravel/helpers (v1.4.0 => v1.2.0):  Checking out 1f978fc5da
  - Downgrading symfony/psr-http-message-bridge (v2.0.2 => v2.0.0):  Checking out ce709cd9c9
  - Downgrading phpseclib/phpseclib (2.0.30 => 2.0.27):  Checking out 34620af4df
  - Downgrading nyholm/psr7 (1.3.2 => 1.2.1):  Checking out 55ff6b7657
  - Downgrading lcobucci/jwt (3.4.3 => 3.3.1):  Checking out a11ec5f4b4
  - Downgrading league/oauth2-server (8.2.4 => 8.0.0):  Checking out e1dc4d708c
  - Downgrading laminas/laminas-diactoros (2.4.1 => 2.2.3):  Checking out b596c7141f
  - Downgrading guzzlehttp/guzzle (6.5.5 => 6.5.3):  Checking out aab4ebd862
  - Downgrading laravel/passport (v9.4.0 => v8.4.4):  Checking out dd4b1d96eb
  - Downgrading laravel/slack-notification-channel (v2.3.1 => v2.0.2):  Checking out ecc90a7079
  - Downgrading nikic/php-parser (v4.10.4 => v4.4.0):  Checking out bd43ec7152
  - Downgrading psy/psysh (v0.10.6 => v0.10.3):  Checking out 2bde2fa03e
  - Downgrading laravel/tinker (v2.6.0 => v2.4.0):  Checking out cde90a7335
  - Downgrading laravelcollective/html (v6.2.1 => v6.0.3):  Checking out bcc317d21a
  - Downgrading league/csv (9.6.2 => 9.5.0):  Checking out b348d09d0d
  - Downgrading mtdowling/jmespath.php (2.6.0 => 2.5.0):  Checking out 52168cb947
  - Downgrading aws/aws-sdk-php (3.173.0 => 3.135.1):  Checking out 59587a4f3f
  - Downgrading league/flysystem-aws-s3-v3 (1.0.29 => 1.0.24):  Checking out 4382036bde
  - Downgrading league/flysystem-cached-adapter (1.1.0 => 1.0.9):  Checking out 08ef74e9be
  - Downgrading masterminds/html5 (2.7.4 => 2.7.0):  Checking out 104443ad66
  - Downgrading robrichards/xmlseclibs (3.1.1 => 3.1.0):  Checking out 8d8e56ca79
  - Downgrading onelogin/php-saml (3.5.1 => 3.4.1):  Checking out 5fbf348670
  - Downgrading paragonie/constant_time_encoding (v2.4.0 => v2.3.0):  Checking out 47a1cedd2e
  - Downgrading patchwork/utf8 (v1.3.3 => v1.3.2):  Checking out d296e0026e
  - Downgrading phpdocumentor/reflection-common (2.2.0 => 2.0.0):  Checking out 63a995caa1
  - Downgrading phpdocumentor/type-resolver (1.4.0 => 1.1.0):  Checking out 7462d5f123
  - Downgrading sebastian/recursion-context (3.0.1 => 3.0.0):  Checking out 5b0cd72350
  - Downgrading sebastian/exporter (3.1.3 => 3.1.2):  Checking out 68609e1261
  - Downgrading sebastian/diff (3.0.3 => 3.0.2):  Checking out 720fcc7e9b
  - Downgrading sebastian/comparator (3.0.3 => 3.0.2):  Checking out 5de4fc177a
  - Downgrading webmozart/assert (1.9.1 => 1.8.0):  Checking out ab2cb0b3b5
  - Downgrading phpdocumentor/reflection-docblock (5.2.2 => 5.1.0):  Checking out cd72d394ca
  - Downgrading doctrine/instantiator (1.4.0 => 1.3.0):  Checking out ae466f7262
  - Downgrading phpspec/prophecy (1.12.2 => v1.10.3):  Checking out 451c3cd141
  - Downgrading pragmarx/google2fa-laravel (v1.4.1 => v1.3.3):  Checking out ed6e0a9ea1
  - Downgrading rollbar/rollbar (v2.1.0 => v2.0.0):  Checking out 245670b32d
  - Downgrading spatie/temporary-directory (1.3.0 => 1.2.2):  Checking out fcb127e615
  - Downgrading spatie/db-dumper (2.21.0 => 2.16.0):  Checking out 7c6d3b7f71
  - Downgrading spatie/laravel-backup (6.11.1 => 6.9.0):  Checking out d92ff3a676
  - Downgrading squizlabs/php_codesniffer (3.5.8 => 3.5.5):  Checking out 73e2e7f57d
  - Downgrading tecnickcom/tc-lib-color (1.14.1 => 1.12.15):  Checking out 2f4860cbac
  - Downgrading tecnickcom/tc-lib-barcode (1.17.1 => 1.15.20):  Checking out dd8de5620e
  - Downgrading tightenco/ziggy (0.9.4 => v0.9.0):  Checking out 5344605c9f
  - Downgrading unicodeveloper/laravel-password (1.0.4 => 1.0.3):  Checking out c2e532cbbb
  - Installing maknz/slack (1.7.0): Cloning 7f21fefc70 from cache
Generating optimized autoload files
> Illuminate\Foundation\ComposerScripts::postAutoloadDump

--------------------------------------------------------
Step 7: Migrating database:
--------------------------------------------------------

Nothing to migrate.

--------------------------------------------------------
Step 8: Checking for OAuth keys:
--------------------------------------------------------

√ OAuth keys detected. Skipping passport install.

--------------------------------------------------------
Step 9: Taking application out of maintenance mode:
--------------------------------------------------------

-- Application is now live.

---------------------- FINISHED! -----------------------
All done! Clear your browser cookies and re-login to use
your upgraded Snipe-IT!
--------------------------------------------------------
kwoodVisions commented 1 year ago

Also, even though composer is installed, it says it can't find composer.phar. Thoughts on that too, or does that not matter?

snipe commented 1 year ago
Git is installed.
^[[28~Already on 'master'                                                                                                                            error: The following untracked working tree files would be overwritten by merge:
        app/Helpers/StorageHelper.php
        app/Http/Controllers/HealthController.php
        app/Http/Middleware/NoSessionStore.php
        app/Policies/PredefinedKitPolicy.php
        database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php
        database/migrations/2020_12_18_090026_swap_target_type_index_order.php
        database/migrations/2020_12_21_153235_update_min_password.php
        database/migrations/2020_12_21_210105_fix_bad_ldap_server_url_for_v5.php
        database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php
        public/img/demo/snipe-logo-bug.png
        resources/views/partials/forms/edit/datepicker.blade.php
Please move or remove them before you merge.
Aborting

That's gonna be a part of this problem I think. It's aborting the git pull, which puts you back where you were.

If you try git stash and run it again, any luck?

kwoodVisions commented 1 year ago
snipeitapp@SNIPEIT:/var/www/snipeit$ git stash
No local changes to save
snipeitapp@SNIPEIT:/var/www/snipeit$ php upgrade.php
--------------------------------------------------------
WELCOME TO THE SNIPE-IT UPGRADER!
--------------------------------------------------------

This script will attempt to:

- check your PHP version and extension requirements
- do a git pull to bring you to the latest version
- run composer install to get your vendors up to date
- run migrations to get your schema up to date
- clear out old cache settings

--------------------------------------------------------
STEP 1: Checking PHP requirements:
--------------------------------------------------------

Current PHP version: (7.4.33) is at least 7.2.0 - continuing...
FYI: The php.ini used by this PHP is: /etc/php/7.4/cli/php.ini

Checking Required PHP extensions...

√ bcmath is installed!
√ curl is installed!
√ fileinfo is installed!
√ gd is installed!
√ json is installed!
√ ldap is installed!
√ mbstring is installed!
√ mysqli is installed!
√ openssl is installed!
√ PDO is installed!
√ tokenizer is installed!
√ xml is installed!
√ zip is installed!

--------------------------------------------------------
STEP 2: Backing up database:
--------------------------------------------------------

-- Starting backup...
Dumping database snipeit...
Determining files to backup...
Zipping 502 files and directories...
Created zip containing 502 files and directories. Size is 11.78 MB
Copying zip to disk named backup...
Successfully copied zip to disk named backup.
Backup completed!

--------------------------------------------------------
STEP 3: Putting application into maintenance mode:
--------------------------------------------------------

-- Application is now in maintenance mode.

--------------------------------------------------------
STEP 4: Pulling latest from Git (master branch):
--------------------------------------------------------

Git is installed.
Already on 'master'
error: The following untracked working tree files would be overwritten by merge:
        app/Helpers/StorageHelper.php
        app/Http/Controllers/HealthController.php
        app/Http/Middleware/NoSessionStore.php
        app/Policies/PredefinedKitPolicy.php
        database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php
        database/migrations/2020_12_18_090026_swap_target_type_index_order.php
        database/migrations/2020_12_21_153235_update_min_password.php
        database/migrations/2020_12_21_210105_fix_bad_ldap_server_url_for_v5.php
        database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php
        public/img/demo/snipe-logo-bug.png
        resources/views/partials/forms/edit/datepicker.blade.php
Please move or remove them before you merge.
Aborting
-- No local changes to save
-- Your branch is behind 'origin/master' by 3312 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
-- Updating f1d0d1bfe..9c205f63a

--------------------------------------------------------
Step 5: Cleaning up old cached files:
--------------------------------------------------------

√ No bootstrap/cache/compiled.php, so nothing to delete.
√ No bootsrap/cache/services.php, so nothing to delete.
√ No bootstrap/cache/config.php, so nothing to delete.

-- Configuration cache cleared!
-- Application cache cleared!
-- Route cache cleared!
-- Compiled views cleared!

--------------------------------------------------------
Step 6: Updating composer dependencies:
(This may take a moment.)
--------------------------------------------------------

-- We couldn't find a local composer.phar. No worries, trying globally.

Generating optimized autoload files
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
Loading composer repositories with package information
Installing dependencies from lock file
Nothing to install or update
Generating optimized autoload files
> Illuminate\Foundation\ComposerScripts::postAutoloadDump

--------------------------------------------------------
Step 7: Migrating database:
--------------------------------------------------------

Nothing to migrate.

--------------------------------------------------------
Step 8: Checking for OAuth keys:
--------------------------------------------------------

√ OAuth keys detected. Skipping passport install.

--------------------------------------------------------
Step 9: Taking application out of maintenance mode:
--------------------------------------------------------

-- Application is now live.

---------------------- FINISHED! -----------------------
All done! Clear your browser cookies and re-login to use
your upgraded Snipe-IT!
--------------------------------------------------------

Here's the output of git stash and the upgrade commands

snipe commented 1 year ago

error: The following untracked working tree files would be overwritten by merge:

I have NO idea why these files would be on your local but somehow untracked. I guess you could try moving them to a temp directory and trying it again?

It's not normally this fiddley to upgrade, I suspect something odd happened on your server between now and 5.1.3 and 6.0.13, but once awe get through this, it should be a cakewalk to upgrade in the future.

snipe commented 1 year ago

The only way I could imagine this happening is if someone tried to download files manually (skipping the git upgrade) so git thinks those are untracked and "new". Once we fix this, every additional upgrade should be a cakewalk.

kwoodVisions commented 1 year ago
--------------------------------------------------------
WELCOME TO THE SNIPE-IT UPGRADER!
--------------------------------------------------------

This script will attempt to:

- check your PHP version and extension requirements
- do a git pull to bring you to the latest version
- run composer install to get your vendors up to date
- run migrations to get your schema up to date
- clear out old cache settings

--------------------------------------------------------
STEP 1: Checking PHP requirements:
--------------------------------------------------------

Current PHP version: (7.4.33) is at least 7.2.0 - continuing...
FYI: The php.ini used by this PHP is: /etc/php/7.4/cli/php.ini

Checking Required PHP extensions...

√ bcmath is installed!
√ curl is installed!
√ fileinfo is installed!
√ gd is installed!
√ json is installed!
√ ldap is installed!
√ mbstring is installed!
√ mysqli is installed!
√ openssl is installed!
√ PDO is installed!
√ tokenizer is installed!
√ xml is installed!
√ zip is installed!

--------------------------------------------------------
STEP 2: Backing up database:
--------------------------------------------------------

-- Starting backup...
Dumping database snipeit...
Determining files to backup...
Zipping 502 files and directories...
Created zip containing 502 files and directories. Size is 11.78 MB
Copying zip to disk named backup...
Successfully copied zip to disk named backup.
Backup completed!

--------------------------------------------------------
STEP 3: Putting application into maintenance mode:
--------------------------------------------------------

-- Application is now in maintenance mode.

--------------------------------------------------------
STEP 4: Pulling latest from Git (master branch):
--------------------------------------------------------

Git is installed.
Already on 'master'
fatal: cannot create directory at 'resources/lang/cy/account': Permission denied
-- No local changes to save
-- Your branch is behind 'origin/master' by 3312 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
-- Updating f1d0d1bfe..9c205f63a

--------------------------------------------------------
Step 5: Cleaning up old cached files:
--------------------------------------------------------

√ No bootstrap/cache/compiled.php, so nothing to delete.
√ No bootsrap/cache/services.php, so nothing to delete.
√ No bootstrap/cache/config.php, so nothing to delete.

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--------------------------------------------------------
Step 6: Updating composer dependencies:
(This may take a moment.)
--------------------------------------------------------

-- We couldn't find a local composer.phar. No worries, trying globally.

Generating optimized autoload files

  [RuntimeException]
  Could not scan for classes inside "tests/DuskTestCase.php" which does not appear to be a file nor a folder

dump-autoload [--no-scripts] [-o|--optimize] [-a|--classmap-authoritative] [--apcu] [--no-dev]

Loading composer repositories with package information
Installing dependencies from lock file
Your requirements could not be resolved to an installable set of packages.

  Problem 1
    - Installation request for doctrine/dbal 3.3.7 -> satisfiable by doctrine/dbal[3.3.7].
    - doctrine/dbal 3.3.7 requires composer-runtime-api ^2 -> no matching package found.

Potential causes:
 - A typo in the package name
 - The package is not available in a stable-enough version according to your minimum-stability setting
   see <https://getcomposer.org/doc/04-schema.md#minimum-stability> for more details.
 - It's a private package and you forgot to add a custom repository to find it

Read <https://getcomposer.org/doc/articles/troubleshooting.md> for further common problems.

--------------------------------------------------------
Step 7: Migrating database:
--------------------------------------------------------

In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--------------------------------------------------------
Step 8: Checking for OAuth keys:
--------------------------------------------------------

√ OAuth keys detected. Skipping passport install.

--------------------------------------------------------
Step 9: Taking application out of maintenance mode:
--------------------------------------------------------

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

---------------------- FINISHED! -----------------------
All done! Clear your browser cookies and re-login to use
your upgraded Snipe-IT!
--------------------------------------------------------

Moved the files that it stated were an issue and then ran git stash -- no changes to save. Ran php upgrade.php and the above is the output.

Sorry for being such a PITA but thank you SO much for your help.

In regards to the comment about manually downloading files, I don't remember a time when I tried to do anything manually. I followed the git process the entire time. I suppose it IS possible that someone else in my environment did something manually but that would be nearly impossible to figure out.

kwoodVisions commented 1 year ago

I see the "git pull" command referenced in there... Would it help/hurt to run that command to try and pull down the latest commits?

snipe commented 1 year ago

Can you run composer --version and tell me the output?

kwoodVisions commented 1 year ago
snipeitapp@SNIPEIT:/var/www/snipeit$ composer --version
Composer version 1.7.3 2018-11-01 10:05:06
snipe commented 1 year ago

AHA. Okay, You'll want to upgrade composer to version 2. Try composer self-update

https://getcomposer.org/doc/03-cli.md#self-update-selfupdate

Command-line interface / Commands - Composer
A Dependency Manager for PHP

(And then try re-running the upgrade.)

kwoodVisions commented 1 year ago
snipeitapp@SNIPEIT:/var/www/snipeit$ composer self-update
Updating to version 2.4.4 (stable channel).
   Downloading (100%)

  [ErrorException]
  rename(/home/snipeitapp/.composer/cache/composer-temp.phar,/usr/local/bin/composer): Permission denied

self-update [-r|--rollback] [--clean-backups] [--no-progress] [--update-keys] [--stable] [--preview] [--snapshot] [--set-channel-only] [--] [<version>]

Should I run this command as root instead of the user I have setup for snipeit ?

snipe commented 1 year ago

Yeah, try sudo or root for that. (Technically speaking, if it's within the snipeitapp home directory, it shouldn't need to be run as root, but it looks like it was installed as root, so let's try that.)

snipe commented 1 year ago

(I wrote a thing that will help you fix the composer as root thing, once we've gotten this sorted: https://snipe.net/2017/11/15/so-you-ran-composer-as-root/)

Snipe.Net
So you ran composer as root... - Snipe.Net
Composer is a PHP dependency manager that’s used in just about any modern PHP application, and it works similarly to how Bundler works for Ruby. Even though Composer itself gives you a warning about not running it as root, lots of people disregard this warning and run it as root anyway. We run into this […]
kwoodVisions commented 1 year ago
--------------------------------------------------------
WELCOME TO THE SNIPE-IT UPGRADER!
--------------------------------------------------------

This script will attempt to:

- check your PHP version and extension requirements
- do a git pull to bring you to the latest version
- run composer install to get your vendors up to date
- run migrations to get your schema up to date
- clear out old cache settings

--------------------------------------------------------
STEP 1: Checking PHP requirements:
--------------------------------------------------------

Current PHP version: (7.4.33) is at least 7.2.0 - continuing...
FYI: The php.ini used by this PHP is: /etc/php/7.4/cli/php.ini

Checking Required PHP extensions...

√ bcmath is installed!
√ curl is installed!
√ fileinfo is installed!
√ gd is installed!
√ json is installed!
√ ldap is installed!
√ mbstring is installed!
√ mysqli is installed!
√ openssl is installed!
√ PDO is installed!
√ tokenizer is installed!
√ xml is installed!
√ zip is installed!

--------------------------------------------------------
STEP 2: Backing up database:
--------------------------------------------------------

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--------------------------------------------------------
STEP 3: Putting application into maintenance mode:
--------------------------------------------------------

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--------------------------------------------------------
STEP 4: Pulling latest from Git (master branch):
--------------------------------------------------------

Git is installed.
Already on 'master'
error: The following untracked working tree files would be overwritten by merge:
        .env.docker
        .env.dusk.local
        .github/ISSUE_TEMPLATE/bug_report.yml
        .github/ISSUE_TEMPLATE/config.yml
        .github/ISSUE_TEMPLATE/feature_request.yml
        .github/dependabot.yml
        .github/workflows/SA-codeql.yml
        .github/workflows/codacy-analysis.yml
        .github/workflows/docker-alpine.yml
        .github/workflows/docker.yml
        Dockerfile.fpm-alpine
        Procfile
        SECURITY.md
        TESTING.md
        ansible/ubuntu/apachevirtualhost.conf.j2
        ansible/ubuntu/vagrant_playbook.yml
        app/Console/Commands/GeneratePersonalAccessToken.php
        app/Console/Commands/KillAllSessions.php
        app/Console/Commands/LdapTroubleshooter.php
        app/Console/Commands/RestoreFromBackup.php
        app/Helpers/StorageHelper.php
        app/Http/Controllers/Accessories/AccessoriesFilesController.php
        app/Http/Controllers/Api/LicenseSeatsController.php
        app/Http/Controllers/AssetModelsFilesController.php
        app/Http/Controllers/Components/ComponentsFilesController.php
        app/Http/Controllers/Consumables/ConsumablesFilesController.php
        app/Http/Controllers/HealthController.php
        app/Http/Livewire/CustomFieldSetDefaultValuesForModel.php
        app/Http/Livewire/LoginForm.php
        app/Http/Middleware/CheckUserIsActivated.php
        app/Http/Middleware/NoSessionStore.php
        app/Http/Middleware/PreventBackHistory.php
        app/Http/Middleware/PreventRequestsDuringMaintenance.php
        app/Http/Middleware/TrimStrings.php
        app/Http/Middleware/TrustHosts.php
        app/Http/Middleware/TrustProxies.php
        app/Http/Requests/SlackSettingsRequest.php
        app/Http/Traits/ConvertsBase64ToFiles.php
        app/Http/Traits/TwoColumnUniqueUndeletedTrait.php
        app/Http/Transformers/DepreciationReportTransformer.php
        app/Http/Transformers/PieChartTransformer.php
        app/Models/SCIMUser.php
        app/Models/SnipeSCIMConfig.php
        app/Notifications/AcceptanceAssetAcceptedNotification.php
        app/Notifications/AcceptanceAssetDeclinedNotification.php
        app/Policies/PredefinedKitPolicy.php
        app/Presenters/DepreciationReportPresenter.php
        app.json
        config/dompdf.php
        config/google2fa.php
        config/livewire.php
        config/scim.php
        database/factories/ActionlogFactory.php
        database/factories/AssetMaintenanceFactory.php
        database/factories/CompanyFactory.php
        database/factories/ComponentFactory.php
        database/factories/CustomFieldFactory.php
        database/factories/DepartmentFactory.php
        database/factories/GroupFactory.php
        database/factories/LocationFactory.php
        database/factories/SettingFactory.php
        database/factories/StatuslabelFactory.php
        database/factories/SupplierFactory.php
        database/migrations/2013_11_15_190357_create_temp_licenses_table.php
        database/migrations/2013_11_25_013244_recreate_licenses_table.php
        database/migrations/2019_04_06_060145_add_user_skin_setting.php
        database/migrations/2019_04_06_205355_add_setting_allow_user_skin.php
        database/migrations/2020_08_11_200712_add_saml_key_rollover.php
        database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php
        database/migrations/2020_12_18_090026_swap_target_type_index_order.php
        database/migrations/2020_12_21_153235_update_min_password.php
        database/migrations/2020_12_21_210105_fix_bad_ldap_server_url_for_v5.php
        database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php
        database/migrations/2021_03_18_184102_adds_several_ldap_fields.php
        database/migrations/2021_04_07_001811_add_ldap_dept.php
        database/migrations/2021_04_14_180125_add_ids_to_tables.php
        database/migrations/2021_06_07_155421_add_serial_number_indexes.php
        database/migrations/2021_06_07_155436_add_company_id_indexes.php
        database/migrations/2021_07_28_031345_add_client_side_l_d_a_p_cert_to_settings.php
        database/migrations/2021_07_28_040554_add_client_side_l_d_a_p_key_to_settings.php
        database/migrations/2021_08_11_005206_add_depreciation_minimum_value.php
        database/migrations/2021_08_24_124354_make_ldap_client_certs_nullable.php
        database/migrations/2021_09_20_183216_change_default_label_to_nullable.php
        database/migrations/2021_12_27_151849_change_supplier_address_length.php
        database/migrations/2022_01_10_182548_add_license_id_index_to_license_seats.php
        database/migratio
Aborting
-- Saved working directory and index state WIP on master: f1d0d1bfe Merge remote-tracking branch 'origin/develop'
-- M    .all-contributorsrc
M       .env.example
M       .env.testing
M       .env.testing-ci
M       .env.tests
M       .env.unit-tests
M       .github/CODEOWNERS
D       .github/ISSUE_TEMPLATE/Bug_report.md
D       .github/ISSUE_TEMPLATE/Feature_request.md
M       .github/autolabeler.yml
M       .gitignore
M       .htaccess
M       .nvmrc
M       Dockerfile
M       Dockerfile.alpine
M       README.md
M       Vagrantfile
M       app/Console/Commands/CheckinLicensesFromAllUsers.php
M       app/Console/Commands/CheckoutLicenseToAllUsers.php
M       app/Console/Commands/CreateAdmin.php
M       app/Console/Commands/DisableLDAP.php
M       app/Console/Commands/FixDoubleEscape.php
M       app/Console/Commands/FixMismatchedAssetsAndLogs.php
M       app/Console/Commands/ImportLocations.php
M       app/Console/Commands/LdapSync.php
D       app/Console/Commands/LdapSyncNg.php
M       app/Console/Commands/MergeUsersByUsername.php
M       app/Console/Commands/MoveUploadsToNewDisk.php
M       app/Console/Commands/ObjectImportCommand.php
M       app/Console/Commands/PaveIt.php
M       app/Console/Commands/Purge.php
M       app/Console/Commands/PurgeLoginAttempts.php
M       app/Console/Commands/ReEncodeCustomFieldNames.php
M       app/Console/Commands/RecryptFromMcrypt.php
M       app/Console/Commands/RegenerateAssetTags.php
M       app/Console/Commands/ResetDemoSettings.php
M       app/Console/Commands/RestoreDeletedUsers.php
M       app/Console/Commands/RotateAppKey.php
M       app/Console/Commands/SendCurrentInventoryToUsers.php
M       app/Console/Commands/SendExpectedCheckinAlerts.php
M       app/Console/Commands/SendExpirationAlerts.php
M       app/Console/Commands/SendUpcomingAuditReport.php
M       app/Console/Commands/SyncAssetCounters.php
M       app/Console/Commands/SyncAssetLocations.php
M       app/Console/Commands/SystemBackup.php
M       app/Console/Commands/Version.php
M       app/Console/Kernel.php
M       app/Events/CheckoutAccepted.php
M       app/Events/CheckoutDeclined.php
M       app/Events/CheckoutableCheckedIn.php
M       app/Events/CheckoutableCheckedOut.php
M       app/Exceptions/CheckoutNotAllowed.php
M       app/Exceptions/Handler.php
M       app/Helpers/Helper.php
M       app/Http/Controllers/Accessories/AccessoriesController.php
M       app/Http/Controllers/Accessories/AccessoryCheckinController.php
M       app/Http/Controllers/Accessories/AccessoryCheckoutController.php
M       app/Http/Controllers/Account/AcceptanceController.php
M       app/Http/Controllers/ActionlogController.php
M       app/Http/Controllers/Api/AccessoriesController.php
M       app/Http/Controllers/Api/AssetMaintenancesController.php
M       app/Http/Controllers/Api/AssetModelsController.php
M       app/Http/Controllers/Api/AssetsController.php
M       app/Http/Controllers/Api/CategoriesController.php
M       app/Http/Controllers/Api/CompaniesController.php
M       app/Http/Controllers/Api/ComponentsController.php
M       app/Http/Controllers/Api/ConsumablesController.php
M       app/Http/Controllers/Api/CustomFieldsController.php
M       app/Http/Controllers/Api/CustomFieldsetsController.php
M       app/Http/Controllers/Api/DepartmentsController.php
M       app/Http/Controllers/Api/DepreciationsController.php
M       app/Http/Controllers/Api/GroupsController.php
M       app/Http/Controllers/Api/ImportController.php
M       app/Http/Controllers/Api/LicensesController.php
M       app/Http/Controllers/Api/LocationsController.php
M       app/Http/Controllers/Api/ManufacturersController.php
M       app/Http/Controllers/Api/PredefinedKitsController.php
M       app/Http/Controllers/Api/ProfileController.php
M       app/Http/Controllers/Api/ReportsController.php
M       app/Http/Controllers/Api/SettingsController.php
M       app/Http/Controllers/Api/StatuslabelsController.php
M       app/Http/Controllers/Api/SuppliersController.php
M       app/Http/Controllers/Api/UsersController.php
M       app/Http/Controllers/AssetMaintenancesController.php
M       app/Http/Controllers/AssetModelsController.php
M       app/Http/Controllers/Assets/AssetCheckinController.php
M       app/Http/Controllers/Assets/AssetCheckoutController.php
M       app/Http/Controllers/Assets/AssetFilesController.php
M       app/Http/Controllers/Assets/AssetsController.php
M       app/Http/Controllers/Assets/BulkAssetsController.php
M       app/Http/Controllers/Auth/ForgotPasswordController.php
M       app/Http/Controllers/Auth/LoginController.php
M       app/Http/Controllers/Auth/RegisterController.php
M       app/Http/Controllers/Auth/ResetPasswordController.php
M       app/Http/Controllers/Auth/SamlController.php
M       app/Http/Controllers/BulkAssetModelsController.php
M       app/Http/Controllers/CategoriesController.php
M       app/Http/Controllers/CheckInOutRequest.php
M       app/Http/Controllers/CompaniesController.php
M       app/Http/Controllers/Components/ComponentCheckinController.php
M       app/Http/Controllers/Components/ComponentCheckoutController.php
M       app/Http/Controllers/Components/ComponentsController.php
M       app/Http/Controllers/Consumables/ConsumableCheckoutController.php
M       app/Http/Controllers/Consumables/ConsumablesController.php
M       app/Http/Controllers/Controller.php
M       app/Http/Controllers/CustomFieldsController.php
M       app/Http/Controllers/CustomFieldsetsController.php
M       app/Http/Controllers/DashboardController.php
M       app/Http/Controllers/DepartmentsController.php
M       app/Http/Controllers/DepreciationsController.php
M       app/Http/Controllers/GroupsController.php
M       app/Http/Controllers/ImportsController.php
M       app/Http/Controllers/Kits/CheckoutKitController.php
M       app/Http/Controllers/Kits/PredefinedKitsController.php
M       app/Http/Controllers/Licenses/LicenseCheckinController.php
M       app/Http/Controllers/Licenses/LicenseCheckoutController.php
M       app/Http/Controllers/Licenses/LicenseFilesController.php
M       app/Http/Controllers/Licenses/LicensesController.php
M       app/Http/Controllers/LocationsController.php
M       app/Http/Controllers/ManufacturersController.php
M       app/Http/Controllers/ModalController.php
M       app/Http/Controllers/ProfileController.php
M       app/Http/Controllers/ReportsController.php
M       app/Http/Controllers/SettingsController.php
M       app/Http/Controllers/StatuslabelsController.php
M       app/Http/Controllers/SuppliersController.php
M       app/Http/Controllers/Users/BulkUsersController.php
M       app/Http/Controllers/Users/LDAPImportController.php
M       app/Http/Controllers/Users/UserFilesController.php
M       app/Http/Controllers/Users/UsersController.php
M       app/Http/Controllers/ViewAssetsController.php
M       app/Http/Kernel.php
M       app/Http/Middleware/AssetCountForSidebar.php
D       app/Http/Middleware/Authenticate.php
M       app/Http/Middleware/CheckForDebug.php
M       app/Http/Middleware/CheckForSetup.php
M       app/Http/Middleware/CheckForTwoFactor.php
M       app/Http/Middleware/CheckPermissions.php
M       app/Http/Middleware/EncryptCookies.php
M       app/Http/Middleware/SecurityHeaders.php
M       app/Http/Middleware/VerifyCsrfToken.php
M       app/Http/Requests/AssetCheckoutRequest.php
M       app/Http/Requests/AssetFileRequest.php
M       app/Http/Requests/CustomFieldRequest.php
M       app/Http/Requests/ImageUploadRequest.php
M       app/Http/Requests/ItemImportRequest.php
M       app/Http/Requests/Request.php
M       app/Http/Requests/SaveUserRequest.php
M       app/Http/Requests/SettingsLdapRequest.php
M       app/Http/Requests/SettingsSamlRequest.php
M       app/Http/Requests/SetupUserRequest.php
M       app/Http/Traits/UniqueUndeletedTrait.php
M       app/Http/Transformers/AccessoriesTransformer.php
M       app/Http/Transformers/ActionlogsTransformer.php
M       app/Http/Transformers/AssetMaintenancesTransformer.php
M       app/Http/Transformers/AssetModelsTransformer.php
M       app/Http/Transformers/AssetsTransformer.php
M       app/Http/Transformers/CategoriesTransformer.php
M       app/Http/Transformers/CompaniesTransformer.php
M       app/Http/Transformers/ComponentsAssetsTransformer.php
M       app/Http/Transformers/ComponentsTransformer.php
M       app/Http/Transformers/ConsumablesTransformer.php
M       app/Http/Transformers/CustomFieldsTransformer.php
M       app/Http/Transformers/CustomFieldsetsTransformer.php
M       app/Http/Transformers/DatatablesTransformer.php
M       app/Http/Transformers/DepartmentsTransformer.php
M       app/Http/Transformers/DepreciationsTransformer.php
M       app/Http/Transformers/GroupsTransformer.php
M       app/Http/Transformers/ImportsTransformer.php
M       app/Http/Transformers/LicenseSeatsTransformer.php
M       app/Http/Transformers/LicensesTransformer.php
M       app/Http/Transformers/LocationsTransformer.php
M       app/Http/Transformers/LoginAttemptsTransformer.php
M       app/Http/Transformers/ManufacturersTransformer.php
M       app/Http/Transformers/PredefinedKitsTransformer.php
M       app/Http/Transformers/SelectlistTransformer.php
M       app/Http/Transformers/StatuslabelsTransformer.php
M       app/Http/Transformers/SuppliersTransformer.php
M       app/Http/Transformers/UsersTransformer.php
M       app/Importer/AccessoryImporter.php
M       app/Importer/AssetImporter.php
M       app/Importer/ComponentImporter.php
M       app/Importer/ConsumableImporter.php
M       app/Importer/Importer.php
M       app/Importer/ItemImporter.php
M       app/Importer/LicenseImporter.php
M       app/Importer/UserImporter.php
M       app/Importer/import_mappings.md
M       app/Listeners/CheckoutableListener.php
M       app/Listeners/LogFailedLogin.php
M       app/Listeners/LogListener.php
M       app/Listeners/LogSuccessfulLogin.php
M       app/Models/Accessory.php
M       app/Models/Actionlog.php
M       app/Models/Asset.php
M       app/Models/AssetMaintenance.php
M       app/Models/AssetModel.php
M       app/Models/Category.php
M       app/Models/CheckoutAcceptance.php
M       app/Models/CheckoutRequest.php
M       app/Models/Company.php
M       app/Models/CompanyableChildScope.php
M       app/Models/CompanyableChildTrait.php
M       app/Models/CompanyableScope.php
M       app/Models/CompanyableTrait.php
M       app/Models/Component.php
M       app/Models/Consumable.php
M       app/Models/ConsumableAssignment.php
M       app/Models/CustomField.php
M       app/Models/CustomFieldset.php
M       app/Models/Department.php
M       app/Models/Depreciable.php
M       app/Models/Depreciation.php
M       app/Models/Group.php
M       app/Models/ICompanyableChild.php
M       app/Models/Import.php
M       app/Models/Ldap.php
M       app/Models/License.php
M       app/Models/LicenseSeat.php
M       app/Models/Location.php
M       app/Models/Loggable.php
M       app/Models/Manufacturer.php
M       app/Models/PredefinedKit.php
M       app/Models/Recipients/AdminRecipient.php
M       app/Models/Requestable.php
M       app/Models/Setting.php
M       app/Models/SnipeModel.php
M       app/Models/Statuslabel.php
M       app/Models/Supplier.php
M       app/Models/Traits/Acceptable.php
M       app/Models/Traits/Searchable.php
M       app/Models/User.php
M       app/Notifications/AuditNotification.php
M       app/Notifications/CheckinAccessoryNotification.php
M       app/Notifications/CheckinAssetNotification.php
M       app/Notifications/CheckinLicenseSeatNotification.php
M       app/Notifications/CheckoutAccessoryNotification.php
M       app/Notifications/CheckoutAssetNotification.php
M       app/Notifications/CheckoutConsumableNotification.php
M       app/Notifications/CheckoutLicenseSeatNotification.php
M       app/Notifications/ExpectedCheckinAdminNotification.php
M       app/Notifications/ExpectedCheckinNotification.php
M       app/Notifications/ExpiringAssetsNotification.php
M       app/Notifications/ExpiringLicenseNotification.php
M       app/Notifications/FirstAdminNotification.php
M       app/Notifications/RequestAssetCancelation.php
M       app/Notifications/RequestAssetNotification.php
M       app/Notifications/SendUpcomingAuditNotification.php
M       app/Notifications/WelcomeNotification.php
M       app/Observers/AccessoryObserver.php
M       app/Observers/AssetObserver.php
M       app/Observers/ComponentObserver.php
M       app/Observers/ConsumableObserver.php
M       app/Observers/LicenseObserver.php
M       app/Observers/SettingObserver.php
M       app/Policies/CheckoutablePermissionsPolicy.php
M       app/Policies/CustomFieldsetPolicy.php
M       app/Policies/LicensePolicy.php
M       app/Policies/SnipePermissionsPolicy.php
M       app/Presenters/AccessoryPresenter.php
M       app/Presenters/ActionlogPresenter.php
M       app/Presenters/AssetAuditPresenter.php
M       app/Presenters/AssetMaintenancesPresenter.php
M       app/Presenters/AssetModelPresenter.php
M       app/Presenters/AssetPresenter.php
M       app/Presenters/CategoryPresenter.php
M       app/Presenters/CompanyPresenter.php
M       app/Presenters/ComponentPresenter.php
M       app/Presenters/ConsumablePresenter.php
M       app/Presenters/DepreciationPresenter.php
M       app/Presenters/LicensePresenter.php
M       app/Presenters/LicenseSeatPresenter.php
M       app/Presenters/LocationPresenter.php
M       app/Presenters/ManufacturerPresenter.php
M       app/Presenters/PredefinedKitPresenter.php
M       app/Presenters/Presentable.php
M       app/Presenters/Presenter.php
M       app/Presenters/UserPresenter.php
M       app/Providers/AppServiceProvider.php
M       app/Providers/AuthServiceProvider.php
M       app/Providers/EventServiceProvider.php
D       app/Providers/LdapServiceProvider.php
M       app/Providers/MacroServiceProvider.php
M       app/Providers/RouteServiceProvider.php
M       app/Providers/SamlServiceProvider.php
M       app/Providers/SettingsServiceProvider.php
M       app/Providers/ValidationServiceProvider.php
D       app/Services/LdapAd.php
D       app/Services/LdapAdConfiguration.php
M       app/Services/PredefinedKitCheckoutService.php
M       app/Services/Saml.php
D       c3.php
D       codeception.yml
M       composer.json
M       composer.lock
M       config/app.php
M       config/auth.php
M       config/backup.php
M       config/broadcasting.php
M       config/cache.php
M       config/compile.php
M       config/cors.php
M       config/database.php
M       config/debugbar.php
M       config/filesystems.php
M       config/image.php
M       config/logging.php
M       config/mail.php
M       config/passport.php
M       config/permissions.php
M       config/queue.php
M       config/services.php
M       config/session.php
M       config/trustedproxy.php
M       config/version.php
M       database/factories/AccessoryFactory.php
D       database/factories/ActionLogFactory.php
M       database/factories/AssetFactory.php
M       database/factories/AssetModelFactory.php
M       database/factories/CategoryFactory.php
D       database/factories/ComponentsFactory.php
M       database/factories/ConsumableFactory.php
D       database/factories/CustomFieldsFactory.php
M       database/factories/CustomFieldsetFactory.php
D       database/factories/DepartmentsFactory.php
M       database/factories/DepreciationFactory.php
M       database/factories/LicenseFactory.php
M       database/factories/ManufacturerFactory.php
D       database/factories/ModelFactory.php
D       database/factories/StatusLabelFactory.php
M       database/factories/UserFactory.php
M       database/migrations/2012_12_06_225921_migration_cartalyst_sentry_install_users.php
M       database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php
M       database/migrations/2012_12_06_225945_migration_cartalyst_sentry_install_users_groups_pivot.php
M       database/migrations/2012_12_06_225988_migration_cartalyst_sentry_install_throttle.php
M       database/migrations/2013_03_23_193214_update_users_table.php
M       database/migrations/2013_11_13_075318_create_models_table.php
M       database/migrations/2013_11_13_075335_create_categories_table.php
M       database/migrations/2013_11_13_075347_create_manufacturers_table.php
M       database/migrations/2013_11_15_015858_add_user_id_to_categories.php
M       database/migrations/2013_11_15_112701_add_user_id_to_manufacturers.php
M       database/migrations/2013_11_15_190327_create_assets_table.php
D       database/migrations/2013_11_15_190357_create_licenses_table.php
M       database/migrations/2013_11_15_201848_add_license_name_to_licenses.php
M       database/migrations/2013_11_16_040323_create_depreciations_table.php
M       database/migrations/2013_11_16_042851_add_depreciation_id_to_models.php
M       database/migrations/2013_11_16_084923_add_user_id_to_models.php
M       database/migrations/2013_11_16_103258_create_locations_table.php
M       database/migrations/2013_11_16_103336_add_location_id_to_assets.php
M       database/migrations/2013_11_16_103407_add_checkedout_to_to_assets.php
M       database/migrations/2013_11_16_103425_create_history_table.php
M       database/migrations/2013_11_17_054359_drop_licenses_table.php
M       database/migrations/2013_11_17_054526_add_physical_to_assets.php
M       database/migrations/2013_11_17_055126_create_settings_table.php
M       database/migrations/2013_11_17_062634_add_license_to_assets.php
M       database/migrations/2013_11_18_134332_add_contacts_to_users.php
M       database/migrations/2013_11_18_142847_add_info_to_locations.php
M       database/migrations/2013_11_18_152942_remove_location_id_from_asset.php
M       database/migrations/2013_11_18_164423_set_nullvalues_for_user.php
M       database/migrations/2013_11_19_013337_create_asset_logs_table.php
M       database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php
M       database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php
M       database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php
M       database/migrations/2013_11_20_121404_add_soft_delete_on_locations.php
M       database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php
M       database/migrations/2013_11_20_123725_add_soft_delete_on_categories.php
M       database/migrations/2013_11_20_130248_create_status_labels.php
M       database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php
M       database/migrations/2013_11_20_131544_add_status_type_on_status_labels.php
M       database/migrations/2013_11_20_134103_add_archived_to_assets.php
M       database/migrations/2013_11_21_002321_add_uploads_table.php
M       database/migrations/2013_11_21_024531_remove_deployable_boolean_from_status_labels.php
M       database/migrations/2013_11_22_075308_add_option_label_to_settings_table.php
M       database/migrations/2013_11_22_213400_edits_to_settings_table.php
D       database/migrations/2013_11_25_013244_create_licenses_table.php
M       database/migrations/2013_11_25_031458_create_license_seats_table.php
M       database/migrations/2013_11_25_032022_add_type_to_actionlog_table.php
M       database/migrations/2013_11_25_033008_delete_bad_licenses_table.php
M       database/migrations/2013_11_25_033131_create_new_licenses_table.php
M       database/migrations/2013_11_25_033534_add_licensed_to_licenses_table.php
M       database/migrations/2013_11_25_101308_add_warrantee_to_assets_table.php
M       database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php
M       database/migrations/2013_11_25_150450_drop_parent_from_categories.php
M       database/migrations/2013_11_25_151920_add_depreciate_to_assets.php
M       database/migrations/2013_11_25_152903_add_depreciate_to_licenses_table.php
M       database/migrations/2013_11_26_211820_drop_license_from_assets_table.php
M       database/migrations/2013_11_27_062510_add_note_to_asset_logs_table.php
M       database/migrations/2013_12_01_113426_add_filename_to_asset_log.php
M       database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php
M       database/migrations/2013_12_10_084038_add_eol_on_models_table.php
M       database/migrations/2013_12_12_055218_add_manager_to_users_table.php
M       database/migrations/2014_01_28_031200_add_qr_code_to_settings_table.php
M       database/migrations/2014_02_13_183016_add_qr_text_to_settings_table.php
M       database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php
M       database/migrations/2014_05_27_231658_alter_default_values_licenses.php
M       database/migrations/2014_06_19_191508_add_asset_name_to_settings.php
M       database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php
M       database/migrations/2014_06_20_005050_make_asset_log_purchasedate_to_nullable.php
M       database/migrations/2014_06_24_003011_add_suppliers.php
M       database/migrations/2014_06_24_010742_add_supplier_id_to_asset.php
M       database/migrations/2014_06_24_012839_add_zip_to_supplier.php
M       database/migrations/2014_06_24_033908_add_url_to_supplier.php
M       database/migrations/2014_07_08_054116_add_employee_id_to_users.php
M       database/migrations/2014_07_09_134316_add_requestable_to_assets.php
M       database/migrations/2014_07_17_085822_add_asset_to_software.php
M       database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php
M       database/migrations/2014_08_12_053504_alpha_0_4_2_release.php
M       database/migrations/2014_08_17_083523_make_location_id_nullable.php
M       database/migrations/2014_10_16_200626_add_rtd_location_to_assets.php
M       database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php
M       database/migrations/2014_10_24_015641_add_display_checkout_date.php
M       database/migrations/2014_10_28_222654_add_avatar_field_to_users_table.php
M       database/migrations/2014_10_29_045924_add_image_field_to_models_table.php
M       database/migrations/2014_11_01_214955_add_eol_display_to_settings.php
M       database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
M       database/migrations/2014_11_05_212408_add_fields_to_licenses.php
M       database/migrations/2014_11_07_021042_add_image_to_supplier.php
M       database/migrations/2014_11_20_203007_add_username_to_user.php
M       database/migrations/2014_11_20_223947_add_auto_to_settings.php
M       database/migrations/2014_11_20_224421_add_prefix_to_settings.php
M       database/migrations/2014_11_21_104401_change_licence_type.php
M       database/migrations/2014_12_09_082500_add_fields_maintained_term_to_licenses.php
M       database/migrations/2015_02_04_155757_increase_user_field_lengths.php
M       database/migrations/2015_02_07_013537_add_soft_deleted_to_log.php
M       database/migrations/2015_02_10_040958_fix_bad_assigned_to_ids.php
M       database/migrations/2015_02_10_053310_migrate_data_to_new_statuses.php
M       database/migrations/2015_02_11_044104_migrate_make_license_assigned_null.php
M       database/migrations/2015_02_11_104406_migrate_create_requests_table.php
M       database/migrations/2015_02_12_001312_add_mac_address_to_asset.php
M       database/migrations/2015_02_12_024100_change_license_notes_type.php
M       database/migrations/2015_02_17_231020_add_localonly_to_settings.php
M       database/migrations/2015_02_19_222322_add_logo_and_colors_to_settings.php
M       database/migrations/2015_02_24_072043_add_alerts_to_settings.php
M       database/migrations/2015_02_25_022931_add_eula_fields.php
M       database/migrations/2015_02_25_204513_add_accessories_table.php
M       database/migrations/2015_02_26_091228_add_accessories_user_table.php
M       database/migrations/2015_02_26_115128_add_deleted_at_models.php
M       database/migrations/2015_02_26_233005_add_category_type.php
M       database/migrations/2015_03_01_231912_update_accepted_at_to_acceptance_id.php
M       database/migrations/2015_03_05_011929_add_qr_type_to_settings.php
M       database/migrations/2015_03_18_055327_add_note_to_user.php
M       database/migrations/2015_04_29_234704_add_slack_to_settings.php
M       database/migrations/2015_05_04_085151_add_parent_id_to_locations_table.php
M       database/migrations/2015_05_22_124421_add_reassignable_to_licenses.php
M       database/migrations/2015_06_10_003314_fix_default_for_user_notes.php
M       database/migrations/2015_06_10_003554_create_consumables.php
M       database/migrations/2015_06_15_183253_move_email_to_username.php
M       database/migrations/2015_06_23_070346_make_email_nullable.php
M       database/migrations/2015_06_26_213716_create_asset_maintenances_table.php
M       database/migrations/2015_07_04_212443_create_custom_fields_table.php
M       database/migrations/2015_07_09_014359_add_currency_to_settings_and_locations.php
M       database/migrations/2015_07_21_122022_add_expected_checkin_date_to_asset_logs.php
M       database/migrations/2015_07_24_093845_add_checkin_email_to_category_table.php
M       database/migrations/2015_07_25_055415_remove_email_unique_constraint.php
M       database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php
M       database/migrations/2015_07_31_015430_add_accepted_to_assets.php
M       database/migrations/2015_09_09_195301_add_custom_css_to_settings.php
M       database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
M       database/migrations/2015_09_22_000104_create_custom_fieldsets.php
M       database/migrations/2015_09_22_003321_add_fieldset_id_to_assets.php
M       database/migrations/2015_09_22_003413_migrate_mac_address.php
M       database/migrations/2015_09_28_003314_fix_default_purchase_order.php
M       database/migrations/2015_10_01_024551_add_accessory_consumable_price_info.php
M       database/migrations/2015_10_12_192706_add_brand_to_settings.php
M       database/migrations/2015_10_22_003314_fix_defaults_accessories.php
M       database/migrations/2015_10_23_182625_add_checkout_time_and_expected_checkout_date_to_assets.php
M       database/migrations/2015_11_05_061015_create_companies_table.php
M       database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php
M       database/migrations/2015_11_05_183749_image.php
M       database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php
M       database/migrations/2015_11_06_100045_add_company_id_to_users_table.php
M       database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php
M       database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php
M       database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
M       database/migrations/2015_11_15_151803_add_full_multiple_companies_support_to_settings_table.php
M       database/migrations/2015_11_26_195528_import_ldap_settings.php
M       database/migrations/2015_11_30_191504_remove_fk_company_id.php
M       database/migrations/2015_12_21_193006_add_ldap_server_cert_ignore_to_settings_table.php
M       database/migrations/2015_12_30_233509_add_timestamp_and_userId_to_custom_fields.php
M       database/migrations/2015_12_30_233658_add_timestamp_and_userId_to_custom_fieldsets.php
M       database/migrations/2016_01_28_041048_add_notes_to_models.php
M       database/migrations/2016_02_19_070119_add_remember_token_to_users_table.php
M       database/migrations/2016_02_19_073625_create_password_resets_table.php
M       database/migrations/2016_03_02_193043_add_ldap_flag_to_users.php
M       database/migrations/2016_03_02_220517_update_ldap_filter_to_longer_field.php
M       database/migrations/2016_03_08_225351_create_components_table.php
M       database/migrations/2016_03_09_024038_add_min_stock_to_tables.php
M       database/migrations/2016_03_10_133849_add_locale_to_users.php
M       database/migrations/2016_03_10_135519_add_locale_to_settings.php
M       database/migrations/2016_03_11_185621_add_label_settings_to_settings.php
M       database/migrations/2016_03_22_125911_fix_custom_fields_regexes.php
M       database/migrations/2016_04_28_141554_add_show_to_users.php
M       database/migrations/2016_05_16_164733_add_model_mfg_to_consumable.php
M       database/migrations/2016_05_19_180351_add_alt_barcode_settings.php
M       database/migrations/2016_05_19_191146_add_alter_interval.php
M       database/migrations/2016_05_19_192226_add_inventory_threshold.php
M       database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php
M       database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php
M       database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php
M       database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php
M       database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php
M       database/migrations/2016_06_01_000004_create_oauth_clients_table.php
M       database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php
M       database/migrations/2016_06_01_140218_add_email_domain_and_format_to_settings.php
M       database/migrations/2016_06_22_160725_add_user_id_to_maintenances.php
M       database/migrations/2016_07_13_150015_add_is_ad_to_settings.php
M       database/migrations/2016_07_14_153609_add_ad_domain_to_settings.php
M       database/migrations/2016_07_22_003348_fix_custom_fields_regex_stuff.php
M       database/migrations/2016_07_22_054850_one_more_mac_addr_fix.php
M       database/migrations/2016_07_22_143045_add_port_to_ldap_settings.php
M       database/migrations/2016_07_22_153432_add_tls_to_ldap_settings.php
M       database/migrations/2016_07_27_211034_add_zerofill_to_settings.php
M       database/migrations/2016_08_02_124944_add_color_to_statuslabel.php
M       database/migrations/2016_08_04_134500_add_disallow_ldap_pw_sync_to_settings.php
M       database/migrations/2016_08_09_002225_add_manufacturer_to_licenses.php
M       database/migrations/2016_08_12_121613_add_manufacturer_to_accessories_table.php
M       database/migrations/2016_08_23_143353_add_new_fields_to_custom_fields.php
M       database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php
M       database/migrations/2016_08_30_084634_make_purchase_cost_nullable.php
M       database/migrations/2016_09_01_141051_add_requestable_to_asset_model.php
M       database/migrations/2016_09_02_001448_create_checkout_requests_table.php
M       database/migrations/2016_09_04_180400_create_actionlog_table.php
M       database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php
M       database/migrations/2016_09_19_235935_fix_fieldtype_for_target_type.php
M       database/migrations/2016_09_23_140722_fix_modelno_in_consumables_to_string.php
M       database/migrations/2016_09_28_231359_add_company_to_logs.php
M       database/migrations/2016_10_14_130709_fix_order_number_to_varchar.php
M       database/migrations/2016_10_16_015024_rename_modelno_to_model_number.php
M       database/migrations/2016_10_16_015211_rename_consumable_modelno_to_model_number.php
M       database/migrations/2016_10_16_143235_rename_model_note_to_notes.php
M       database/migrations/2016_10_16_165052_rename_component_total_qty_to_qty.php
M       database/migrations/2016_10_19_145520_fix_order_number_in_components_to_string.php
M       database/migrations/2016_10_27_151715_add_serial_to_components.php
M       database/migrations/2016_10_27_213251_increase_serial_field_capacity.php
M       database/migrations/2016_10_29_002724_enable_2fa_fields.php
M       database/migrations/2016_10_29_082408_add_signature_to_acceptance.php
M       database/migrations/2016_11_01_030818_fix_forgotten_filename_in_action_logs.php
M       database/migrations/2016_11_13_020954_rename_component_serial_number_to_serial.php
M       database/migrations/2016_11_16_172119_increase_purchase_cost_size.php
M       database/migrations/2016_11_17_161317_longer_state_field_in_location.php
M       database/migrations/2016_11_17_193706_add_model_number_to_accessories.php
M       database/migrations/2016_11_24_160405_add_missing_target_type_to_logs_table.php
M       database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php
M       database/migrations/2016_12_19_004212_adjust_locale_length_to_10.php
M       database/migrations/2016_12_19_133936_extend_phone_lengths_in_supplier_and_elsewhere.php
M       database/migrations/2016_12_27_212631_make_asset_assigned_to_polymorphic.php
M       database/migrations/2017_01_09_040429_create_locations_ldap_query_field.php
M       database/migrations/2017_01_14_002418_create_imports_table.php
M       database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php
M       database/migrations/2017_03_03_154632_add_time_date_display_to_settings.php
M       database/migrations/2017_03_10_210807_add_fields_to_manufacturer.php
M       database/migrations/2017_05_08_195520_increase_size_of_field_values_in_custom_fields.php
M       database/migrations/2017_05_22_204422_create_departments.php
M       database/migrations/2017_05_22_233509_add_manager_to_locations_table.php
M       database/migrations/2017_06_14_122059_add_next_autoincrement_to_settings.php
M       database/migrations/2017_06_18_151753_add_header_and_first_row_to_importer_table.php
M       database/migrations/2017_07_07_191533_add_login_text.php
M       database/migrations/2017_07_25_130710_add_thumbsize_to_settings.php
M       database/migrations/2017_08_03_160105_set_asset_archived_to_zero_default.php
M       database/migrations/2017_08_22_180636_add_secure_password_options.php
M       database/migrations/2017_08_25_074822_add_auditing_tables.php
M       database/migrations/2017_08_25_101435_add_auditing_to_settings.php
M       database/migrations/2017_09_18_225619_fix_assigned_type_not_being_nulled.php
M       database/migrations/2017_10_03_015503_drop_foreign_keys.php
M       database/migrations/2017_10_10_123504_allow_nullable_depreciation_id_in_models.php
M       database/migrations/2017_10_17_133709_add_display_url_to_settings.php
M       database/migrations/2017_10_19_120002_add_custom_forgot_password_url.php
M       database/migrations/2017_10_19_130406_add_image_and_supplier_to_accessories.php
M       database/migrations/2017_10_20_234129_add_location_indices_to_assets.php
M       database/migrations/2017_10_25_202930_add_images_uploads_to_locations_manufacturers_etc.php
M       database/migrations/2017_10_27_180947_denorm_asset_locations.php
M       database/migrations/2017_10_27_192423_migrate_denormed_asset_locations.php
M       database/migrations/2017_10_30_182938_add_address_to_user.php
M       database/migrations/2017_11_08_025918_add_alert_menu_setting.php
M       database/migrations/2017_11_08_123942_labels_display_company_name.php
M       database/migrations/2017_12_12_010457_normalize_asset_last_audit_date.php
M       database/migrations/2017_12_12_033618_add_actionlog_meta.php
M       database/migrations/2017_12_26_170856_re_normalize_last_audit.php
M       database/migrations/2018_01_17_184354_add_archived_in_list_setting.php
M       database/migrations/2018_01_19_203121_add_dashboard_message_to_settings.php
M       database/migrations/2018_01_24_062633_add_footer_settings_to_settings.php
M       database/migrations/2018_01_24_093426_add_modellist_preferenc.php
M       database/migrations/2018_02_22_160436_add_remote_user_settings.php
M       database/migrations/2018_03_03_011032_add_theme_to_settings.php
M       database/migrations/2018_03_06_054937_add_default_flag_on_statuslabels.php
M       database/migrations/2018_03_23_212048_add_display_in_email_to_custom_fields.php
M       database/migrations/2018_03_24_030738_add_show_images_in_email_setting.php
M       database/migrations/2018_03_24_050108_add_cc_alerts.php
M       database/migrations/2018_03_29_053618_add_canceled_at_and_fulfilled_at_in_requests.php
M       database/migrations/2018_03_29_070121_add_drop_unique_requests.php
M       database/migrations/2018_03_29_070511_add_new_index_requestable.php
M       database/migrations/2018_04_02_150700_labels_display_model_name.php
M       database/migrations/2018_04_16_133902_create_custom_field_default_values_table.php
M       database/migrations/2018_05_04_073223_add_category_to_licenses.php
M       database/migrations/2018_05_04_075235_add_update_license_category.php
M       database/migrations/2018_05_08_031515_add_gdpr_privacy_footer.php
M       database/migrations/2018_05_14_215229_add_indexes.php
M       database/migrations/2018_05_14_223646_add_indexes_to_assets.php
M       database/migrations/2018_05_14_233638_denorm_counters_on_assets.php
M       database/migrations/2018_05_16_153409_add_first_counter_totals_to_assets.php
M       database/migrations/2018_06_21_134622_add_version_footer.php
M       database/migrations/2018_07_05_215440_add_unique_serial_option_to_settings.php
M       database/migrations/2018_07_17_005911_create_login_attempts_table.php
M       database/migrations/2018_07_24_154348_add_logo_to_print_assets.php
M       database/migrations/2018_07_28_023826_create_checkout_acceptances_table.php
M       database/migrations/2018_08_20_204842_add_depreciation_option_to_settings.php
M       database/migrations/2018_09_10_082212_create_checkout_acceptances_for_unaccepted_assets.php
M       database/migrations/2018_10_18_191228_add_kits_licenses_table.php
M       database/migrations/2018_10_19_153910_add_kits_table.php
M       database/migrations/2018_10_19_154013_add_kits_models_table.php
M       database/migrations/2018_12_05_211936_add_favicon_to_settings.php
M       database/migrations/2018_12_05_212119_add_email_logo_to_settings.php
M       database/migrations/2019_02_07_185953_add_kits_consumables_table.php
M       database/migrations/2019_02_07_190030_add_kits_accessories_table.php
M       database/migrations/2019_02_12_182750_add_actiondate_to_actionlog.php
M       database/migrations/2019_02_14_154310_change_auto_increment_prefix_to_nullable.php
M       database/migrations/2019_02_16_143518_auto_increment_back_to_string.php
M       database/migrations/2019_02_17_205048_add_label_logo_to_settings.php
M       database/migrations/2019_02_20_234421_make_serial_nullable.php
M       database/migrations/2019_02_21_224703_make_fields_nullable_for_integrity.php
M       database/migrations/2019_06_12_184327_rename_groups_table.php
M       database/migrations/2019_07_23_140906_add_show_assigned_assets_to_settings.php
M       database/migrations/2019_08_20_084049_add_custom_remote_user_header.php
M       database/migrations/2020_02_04_172100_add_ad_append_domain_settings.php
M       database/migrations/2020_04_29_222305_add_saml_fields_to_settings.php
M       database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
M       database/migrations/2020_10_23_161736_fix_zero_values_for_locations.php
D       database/seeds/.gitkeep
D       database/seeds/AccessorySeeder.php
D       database/seeds/ActionlogSeeder.php
D       database/seeds/AssetModelSeeder.php
D       database/seeds/AssetSeeder.php
D       database/seeds/CategorySeeder.php
D       database/seeds/CompanySeeder.php
D       database/seeds/ComponentSeeder.php
D       database/seeds/ConsumableSeeder.php
D       database/seeds/CustomFieldSeeder.php
D       database/seeds/DatabaseSeeder.php
D       database/seeds/DepartmentSeeder.php
D       database/seeds/DepreciationSeeder.php
D       database/seeds/LicenseSeeder.php
D       database/seeds/LocationSeeder.php
D       database/seeds/ManufacturerSeeder.php
D       database/seeds/SettingsSeeder.php
D       database/seeds/StatuslabelSeeder.php
D       database/seeds/SupplierSeeder.php
D       database/seeds/UserSeeder.php
M       docker/entrypoint_alpine.sh
M       docker/startup.sh
M       docker/supervisor-exit-event-listener
D       index.html
M       package-lock.json
M       package.json
M       phpunit.xml
M       public/.htaccess
M       public/css/build/AdminLTE.css
M       public/css/build/app.css
M       public/css/build/overrides.css
D       public/css/build/signature-pad.min.css
M       public/css/dist/all.css
M       public/css/dist/bootstrap-table.css
M       public/css/dist/skins/skin-black-dark.css
M       public/css/dist/skins/skin-black-dark.min.css
M       public/css/dist/skins/skin-black.css
M       public/css/dist/skins/skin-blue-dark.css
M       public/css/dist/skins/skin-blue-dark.min.css
M       public/css/dist/skins/skin-blue.css
M       public/css/dist/skins/skin-contrast.css
M       public/css/dist/skins/skin-contrast.min.css
M       public/css/dist/skins/skin-green-dark.css
M       public/css/dist/skins/skin-green-dark.min.css
M       public/css/dist/skins/skin-green.css
M       public/css/dist/skins/skin-orange-dark.css
M       public/css/dist/skins/skin-orange-dark.min.css
M       public/css/dist/skins/skin-orange.css
M       public/css/dist/skins/skin-purple-dark.css
M       public/css/dist/skins/skin-purple-dark.min.css
M       public/css/dist/skins/skin-purple.css
M       public/css/dist/skins/skin-red-dark.css
M       public/css/dist/skins/skin-red-dark.min.css
M       public/css/dist/skins/skin-red.css
M       public/css/dist/skins/skin-yellow-dark.css
M       public/css/dist/skins/skin-yellow-dark.min.css
M       public/css/dist/skins/skin-yellow.css
D       public/css/fonts/FontAwesome.otf
D       public/css/fonts/fontawesome-webfont.eot
D       public/css/fonts/fontawesome-webfont.svg
D       public/css/fonts/fontawesome-webfont.ttf
D       public/css/fonts/fontawesome-webfont.woff
D       public/css/fonts/fontawesome-webfont.woff2
M       public/css/skins/dist/skin-black-dark.css
D       public/img/demo/models/iphone6.jpg
D       public/img/demo/models/iphone7.jpg
M       public/img/demo/snipe-logo.png
M       public/index.php
M       public/js/bootstrap.datepicker.js
M       public/js/build/app.js
M       public/js/build/vendor.js
M       public/js/build/vue.js
M       public/js/demo.js
M       public/js/dist/all.js
M       public/js/dist/bootstrap-table.js
M       public/js/extensions/export/bootstrap-table-export.js
M       public/js/extensions/export/bootstrap-table-export.min.js
M       public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
M       public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
M       public/js/plugins/chartjs/Chart.bundle.js
M       public/js/plugins/daterangepicker/daterangepicker.js
D       public/js/snipeit.js
M       public/mix-manifest.json
D       resources/assets/css/font-awesome/font-awesome.css
D       resources/assets/css/font-awesome/font-awesome.min.css
D       resources/assets/css/fonts/FontAwesome.otf
D       resources/assets/css/fonts/fontawesome-webfont.eot
D       resources/assets/css/fonts/fontawesome-webfont.svg
D       resources/assets/css/fonts/fontawesome-webfont.ttf
D       resources/assets/css/fonts/fontawesome-webfont.woff
D       resources/assets/css/fonts/fontawesome-webfont.woff2
M       resources/assets/js/bootstrap.datepicker.js
M       resources/assets/js/bootstrap.js
M       resources/assets/js/components/alert.vue
D       resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
M       resources/assets/js/components/importer/importer-file.vue
M       resources/assets/js/components/importer/importer.vue
M       resources/assets/js/components/passport/PersonalAccessTokens.vue
M       resources/assets/js/components/select2.vue
M       resources/assets/js/demo.js
M       resources/assets/js/extensions/export/bootstrap-table-export.js
M       resources/assets/js/extensions/export/bootstrap-table-export.min.js
M       resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
M       resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
M       resources/assets/js/snipeit.js
M       resources/assets/js/snipeit_modals.js
M       resources/assets/js/vue.js
M       resources/assets/less/ekko-lightbox.less
M       resources/assets/less/overrides.less
M       resources/assets/less/skins/skin-black-dark.less
M       resources/assets/less/skins/skin-black.less
M       resources/assets/less/skins/skin-blue-dark.less
M       resources/assets/less/skins/skin-blue.less
M       resources/assets/less/skins/skin-contrast.less
M       resources/assets/less/skins/skin-green-dark.less
M       resources/assets/less/skins/skin-green.less
M       resources/assets/less/skins/skin-orange-dark.less
M       resources/assets/less/skins/skin-orange.less
M       resources/assets/less/skins/skin-purple-dark.less
M       resources/assets/less/skins/skin-purple.less
M       resources/assets/less/skins/skin-red-dark.less
M       resources/assets/less/skins/skin-red.less
M       resources/assets/less/skins/skin-yellow-dark.less
M       resources/assets/less/skins/skin-yellow.less
M       resources/assets/less/variables.less
M       resources/lang/af/admin/asset_maintenances/general.php
M       resources/lang/af/admin/asset_maintenances/message.php
M       resources/lang/af/admin/asset_maintenances/table.php
M       resources/lang/af/admin/categories/general.php
M       resources/lang/af/admin/companies/general.php
M       resources/lang/af/admin/companies/message.php
M       resources/lang/af/admin/custom_fields/general.php
M       resources/lang/af/admin/custom_fields/message.php
M       resources/lang/af/admin/depreciations/general.php
M       resources/lang/af/admin/depreciations/table.php
M       resources/lang/af/admin/groups/titles.php
M       resources/lang/af/admin/hardware/form.php
M       resources/lang/af/admin/hardware/general.php
M       resources/lang/af/admin/hardware/message.php
M       resources/lang/af/admin/hardware/table.php
M       resources/lang/af/admin/kits/general.php
M       resources/lang/af/admin/licenses/message.php
M       resources/lang/af/admin/locations/table.php
M       resources/lang/af/admin/models/general.php
M       resources/lang/af/admin/reports/general.php
M       resources/lang/af/admin/settings/general.php
M       resources/lang/af/admin/settings/message.php
M       resources/lang/af/admin/statuslabels/message.php
M       resources/lang/af/admin/users/general.php
M       resources/lang/af/admin/users/message.php
M       resources/lang/af/admin/users/table.php
M       resources/lang/af/auth/general.php
M       resources/lang/af/button.php
M       resources/lang/af/general.php
M       resources/lang/af/help.php
M       resources/lang/af/mail.php
M       resources/lang/af/passwords.php
M       resources/lang/af/reminders.php
M       resources/lang/af/validation.php
M       resources/lang/ar/admin/asset_maintenances/general.php
M       resources/lang/ar/admin/asset_maintenances/message.php
M       resources/lang/ar/admin/asset_maintenances/table.php
M       resources/lang/ar/admin/categories/general.php
M       resources/lang/ar/admin/companies/general.php
M       resources/lang/ar/admin/companies/message.php
M       resources/lang/ar/admin/custom_fields/general.php
M       resources/lang/ar/admin/custom_fields/message.php
M       resources/lang/ar/admin/depreciations/general.php
M       resources/lang/ar/admin/depreciations/table.php
M       resources/lang/ar/admin/groups/titles.php
M       resources/lang/ar/admin/hardware/form.php
M       resources/lang/ar/admin/hardware/general.php
M       resources/lang/ar/admin/hardware/message.php
M       resources/lang/ar/admin/hardware/table.php
M       resources/lang/ar/admin/kits/general.php
M       resources/lang/ar/admin/licenses/message.php
M       resources/lang/ar/admin/locations/table.php
M       resources/lang/ar/admin/models/general.php
M       resources/lang/ar/admin/reports/general.php
M       resources/lang/ar/admin/settings/general.php
M       resources/lang/ar/admin/settings/message.php
M       resources/lang/ar/admin/statuslabels/message.php
M       resources/lang/ar/admin/users/general.php
M       resources/lang/ar/admin/users/message.php
M       resources/lang/ar/admin/users/table.php
M       resources/lang/ar/auth/general.php
M       resources/lang/ar/button.php
M       resources/lang/ar/general.php
M       resources/lang/ar/help.php
M       resources/lang/ar/mail.php
M       resources/lang/ar/passwords.php
M       resources/lang/ar/reminders.php
M       resources/lang/ar/validation.php
M       resources/lang/bg/admin/accessories/message.php
M       resources/lang/bg/admin/asset_maintenances/general.php
M       resources/lang/bg/admin/asset_maintenances/message.php
M       resources/lang/bg/admin/asset_maintenances/table.php
M       resources/lang/bg/admin/categories/general.php
M       resources/lang/bg/admin/companies/general.php
M       resources/lang/bg/admin/companies/message.php
M       resources/lang/bg/admin/custom_fields/general.php
M       resources/lang/bg/admin/custom_fields/message.php
M       resources/lang/bg/admin/depreciations/general.php
M       resources/lang/bg/admin/depreciations/table.php
M       resources/lang/bg/admin/groups/titles.php
M       resources/lang/bg/admin/hardware/form.php
M       resources/lang/bg/admin/hardware/general.php
M       resources/lang/bg/admin/hardware/message.php
M       resources/lang/bg/admin/hardware/table.php
M       resources/lang/bg/admin/kits/general.php
M       resources/lang/bg/admin/licenses/message.php
M       resources/lang/bg/admin/locations/table.php
M       resources/lang/bg/admin/models/general.php
M       resources/lang/bg/admin/reports/general.php
M       resources/lang/bg/admin/settings/general.php
M       resources/lang/bg/admin/settings/message.php
M       resources/lang/bg/admin/statuslabels/message.php
M       resources/lang/bg/admin/users/general.php
M       resources/lang/bg/admin/users/message.php
M       resources/lang/bg/admin/users/table.php
M       resources/lang/bg/auth/general.php
M       resources/lang/bg/auth/message.php
M       resources/lang/bg/button.php
M       resources/lang/bg/general.php
M       resources/lang/bg/help.php
M       resources/lang/bg/mail.php
M       resources/lang/bg/passwords.php
M       resources/lang/bg/reminders.php
M       resources/lang/bg/validation.php
M       resources/lang/cs/admin/accessories/message.php
M       resources/lang/cs/admin/asset_maintenances/general.php
M       resources/lang/cs/admin/asset_maintenances/message.php
M       resources/lang/cs/admin/asset_maintenances/table.php
M       resources/lang/cs/admin/categories/general.php
M       resources/lang/cs/admin/companies/general.php
M       resources/lang/cs/admin/companies/message.php
M       resources/lang/cs/admin/custom_fields/general.php
M       resources/lang/cs/admin/custom_fields/message.php
M       resources/lang/cs/admin/depreciations/general.php
M       resources/lang/cs/admin/depreciations/table.php
M       resources/lang/cs/admin/groups/titles.php
M       resources/lang/cs/admin/hardware/form.php
M       resources/lang/cs/admin/hardware/general.php
M       resources/lang/cs/admin/hardware/message.php
M       resources/lang/cs/admin/hardware/table.php
M       resources/lang/cs/admin/kits/general.php
M       resources/lang/cs/admin/licenses/message.php
M       resources/lang/cs/admin/locations/table.php
M       resources/lang/cs/admin/models/general.php
M       resources/lang/cs/admin/reports/general.php
M       resources/lang/cs/admin/settings/general.php
M       resources/lang/cs/admin/settings/message.php
M       resources/lang/cs/admin/statuslabels/message.php
M       resources/lang/cs/admin/users/general.php
M       resources/lang/cs/admin/users/message.php
M       resources/lang/cs/admin/users/table.php
M       resources/lang/cs/auth/general.php
M       resources/lang/cs/auth/message.php
M       resources/lang/cs/button.php
M       resources/lang/cs/general.php
M       resources/lang/cs/help.php
M       resources/lang/cs/mail.php
M       resources/lang/cs/passwords.php
M       resources/lang/cs/reminders.php
M       resources/lang/cs/validation.php
D       resources/views/account/accept-asset.blade.php
D       resources/views/hardware/qr-view.blade.php
D       tests/TODO.testing
D       tests/unit/AccessoryTest.php
D       tests/unit/AssetMaintenanceTest.php
D       tests/unit/AssetModelTest.php
D       tests/unit/AssetTest.php
D       tests/unit/BaseTest.php
D       tests/unit/CategoryTest.php
D       tests/unit/CompanyTest.php
D       tests/unit/ComponentTest.php
D       tests/unit/ConsumableTest.php
D       tests/unit/CustomFieldTest.php
D       tests/unit/DepartmentTest.php
D       tests/unit/DepreciationTest.php
D       tests/unit/ImporterTest.php
D       tests/unit/LocationTest.php
D       tests/unit/ManufacturerTest.php
D       tests/unit/NotificationTest.php
D       tests/unit/PermissionsTest.php
D       tests/unit/SnipeModelTest.php
D       tests/unit/StatuslabelTest.php
D       tests/unit/SupplierTest.php
D       tests/unit/UserTest.php
D       tests/unit/_bootstrap.php
Your branch is behind 'origin/master' by 3312 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
-- Updating f1d0d1bfe..9c205f63a

--------------------------------------------------------
Step 5: Cleaning up old cached files:
--------------------------------------------------------

√ No bootstrap/cache/compiled.php, so nothing to delete.
√ No bootsrap/cache/services.php, so nothing to delete.
√ No bootstrap/cache/config.php, so nothing to delete.

-- Configuration cache cleared!
-- Application cache cleared!
-- Route cache cleared!
-- Compiled views cleared!

--------------------------------------------------------
Step 6: Updating composer dependencies:
(This may take a moment.)
--------------------------------------------------------

-- We couldn't find a local composer.phar. No worries, trying globally.

Warning: Ambiguous class resolution, "ReCreateLicensesTable" was found in both "/var/www/snipeit/database/migrations/2013_11_25_013244_recreate_licenses_table.php" and "/var/www/snipeit/database/migrations/2013_11_25_013244_create_licenses_table.php", the first will be used.
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
Installing dependencies from lock file
Verifying lock file contents can be installed on current platform.
Nothing to install, update or remove
Generating optimized autoload files
Warning: Ambiguous class resolution, "ReCreateLicensesTable" was found in both "/var/www/snipeit/database/migrations/2013_11_25_013244_recreate_licenses_table.php" and "/var/www/snipeit/database/migrations/2013_11_25_013244_create_licenses_table.php", the first will be used.
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
Generating optimized autoload files
Generated optimized autoload files containing 5602 classes

--------------------------------------------------------
Step 7: Migrating database:
--------------------------------------------------------

Migrating: 2013_11_15_190357_create_temp_licenses_table
Migrated:  2013_11_15_190357_create_temp_licenses_table (0 seconds)
Migrating: 2013_11_25_013244_recreate_licenses_table
Migrated:  2013_11_25_013244_recreate_licenses_table (0 seconds)
Migrating: 2019_04_06_060145_add_user_skin_setting
Migrated:  2019_04_06_060145_add_user_skin_setting (0.2 seconds)
Migrating: 2019_04_06_205355_add_setting_allow_user_skin
Migrated:  2019_04_06_205355_add_setting_allow_user_skin (0.08 seconds)
Migrating: 2020_08_11_200712_add_saml_key_rollover
Migrated:  2020_08_11_200712_add_saml_key_rollover (0.43 seconds)
Migrating: 2021_03_18_184102_adds_several_ldap_fields
Migrated:  2021_03_18_184102_adds_several_ldap_fields (0.09 seconds)
Migrating: 2021_04_07_001811_add_ldap_dept
Migrated:  2021_04_07_001811_add_ldap_dept (0.08 seconds)
Migrating: 2021_04_14_180125_add_ids_to_tables
Migrated:  2021_04_14_180125_add_ids_to_tables (0.12 seconds)
Migrating: 2021_06_07_155421_add_serial_number_indexes
Migrated:  2021_06_07_155421_add_serial_number_indexes (0.05 seconds)
Migrating: 2021_06_07_155436_add_company_id_indexes
Migrated:  2021_06_07_155436_add_company_id_indexes (0.41 seconds)
Migrating: 2021_07_28_031345_add_client_side_l_d_a_p_cert_to_settings
Migrated:  2021_07_28_031345_add_client_side_l_d_a_p_cert_to_settings (0.1 seconds)
Migrating: 2021_07_28_040554_add_client_side_l_d_a_p_key_to_settings
Migrated:  2021_07_28_040554_add_client_side_l_d_a_p_key_to_settings (0.08 seconds)
Migrating: 2021_08_11_005206_add_depreciation_minimum_value
Migrated:  2021_08_11_005206_add_depreciation_minimum_value (0.08 seconds)
Migrating: 2021_08_24_124354_make_ldap_client_certs_nullable
Migrated:  2021_08_24_124354_make_ldap_client_certs_nullable (0.03 seconds)
Migrating: 2021_09_20_183216_change_default_label_to_nullable
Migrated:  2021_09_20_183216_change_default_label_to_nullable (0.1 seconds)
Migrating: 2021_12_27_151849_change_supplier_address_length
Migrated:  2021_12_27_151849_change_supplier_address_length (0.17 seconds)
Migrating: 2022_01_10_182548_add_license_id_index_to_license_seats
Migrated:  2022_01_10_182548_add_license_id_index_to_license_seats (0.09 seconds)
Migrating: 2022_02_03_214958_blank_out_ldap_active_flag
Migrated:  2022_02_03_214958_blank_out_ldap_active_flag (0.02 seconds)
Migrating: 2022_02_16_152431_add_unique_constraint_to_custom_field
Migrated:  2022_02_16_152431_add_unique_constraint_to_custom_field (0.08 seconds)
Migrating: 2022_03_03_225655_add_notes_to_accessories
Migrated:  2022_03_03_225655_add_notes_to_accessories (0.1 seconds)
Migrating: 2022_03_03_225754_add_notes_to_components
Migrated:  2022_03_03_225754_add_notes_to_components (0.09 seconds)
Migrating: 2022_03_03_225824_add_notes_to_consumables
Migrated:  2022_03_03_225824_add_notes_to_consumables (0.1 seconds)
Migrating: 2022_03_04_080836_add_remote_to_user
Migrated:  2022_03_04_080836_add_remote_to_user (0.17 seconds)
Migrating: 2022_03_09_001334_add_eula_to_checkout_acceptance
Migrated:  2022_03_09_001334_add_eula_to_checkout_acceptance (0.1 seconds)
Migrating: 2022_03_10_175740_add_eula_to_action_logs
Migrated:  2022_03_10_175740_add_eula_to_action_logs (0.6 seconds)
Migrating: 2022_03_21_162724_adds_ldap_manager
Migrated:  2022_03_21_162724_adds_ldap_manager (0.11 seconds)
Migrating: 2022_04_05_135340_add_primary_key_to_custom_fields_pivot
Migrated:  2022_04_05_135340_add_primary_key_to_custom_fields_pivot (0.09 seconds)
Migrating: 2022_05_16_235350_remove_stored_eula_field
Migrated:  2022_05_16_235350_remove_stored_eula_field (0.59 seconds)
Migrating: 2022_06_23_164407_add_user_id_to_users
Migrated:  2022_06_23_164407_add_user_id_to_users (0.2 seconds)
Migrating: 2022_06_28_234539_add_username_index_to_users
Migrated:  2022_06_28_234539_add_username_index_to_users (0.05 seconds)
Migrating: 2022_07_07_010406_add_indexes_to_license_seats
Migrated:  2022_07_07_010406_add_indexes_to_license_seats (0.14 seconds)
Migrating: 2022_08_10_141328_add_notes_denorm_to_consumables_users
Migrated:  2022_08_10_141328_add_notes_denorm_to_consumables_users (0.17 seconds)
Migrating: 2022_09_29_040231_add_chart_type_to_settings
Migrated:  2022_09_29_040231_add_chart_type_to_settings (0.09 seconds)
Migrating: 2022_10_05_163044_add_start_termination_date_to_users
Migrated:  2022_10_05_163044_add_start_termination_date_to_users (0.17 seconds)
Migrating: 2022_10_25_193823_add_externalid_to_users
Migrated:  2022_10_25_193823_add_externalid_to_users (0.17 seconds)
Migrating: 2022_11_07_134348_add_display_to_user_in_custom_fields
Migrated:  2022_11_07_134348_add_display_to_user_in_custom_fields (0.08 seconds)

--------------------------------------------------------
Step 8: Checking for OAuth keys:
--------------------------------------------------------

√ OAuth keys detected. Skipping passport install.

--------------------------------------------------------
Step 9: Taking application out of maintenance mode:
--------------------------------------------------------

-- Application is now live.

---------------------- FINISHED! -----------------------
All done! Clear your browser cookies and re-login to use
your upgraded Snipe-IT!
--------------------------------------------------------

OK, ran composer self-update as root and that allowed that to update. I ran php upgrade.php and got the output above.

snipe commented 1 year ago

Oh that looks GOOD! That's about the number of migrations I'd expect from this level of upgrade. How are things working now? Are you seeing the correct version?

kwoodVisions commented 1 year ago

This is the version listed at the bottom of the page:

Version v5.0.11 - build 5695 (master)

snipe commented 1 year ago

That's weird..

2022_11_07_134348_add_display_to_user_in_custom_fields (0.08 seconds)

That's obviously quite recent.

Try php artisan config:clear; php artisan cache:clear; php artisan view:clear;

snipe commented 1 year ago

(Still, this is progress.)

kwoodVisions commented 1 year ago

It's sounding like this is progress. In my previous output, I did see I had the issue:

error: The following untracked working tree files would be overwritten by merge:

I ran the commands you mentioned but version remains unchanged.

kwoodVisions commented 1 year ago
--------------------------------------------------------
WELCOME TO THE SNIPE-IT UPGRADER!
--------------------------------------------------------

This script will attempt to:

- check your PHP version and extension requirements
- do a git pull to bring you to the latest version
- run composer install to get your vendors up to date
- run migrations to get your schema up to date
- clear out old cache settings

--------------------------------------------------------
STEP 1: Checking PHP requirements:
--------------------------------------------------------

Current PHP version: (7.4.33) is at least 7.2.0 - continuing...
FYI: The php.ini used by this PHP is: /etc/php/7.4/cli/php.ini

Checking Required PHP extensions...

√ bcmath is installed!
√ curl is installed!
√ fileinfo is installed!
√ gd is installed!
√ json is installed!
√ ldap is installed!
√ mbstring is installed!
√ mysqli is installed!
√ openssl is installed!
√ PDO is installed!
√ tokenizer is installed!
√ xml is installed!
√ zip is installed!

--------------------------------------------------------
STEP 2: Backing up database:
--------------------------------------------------------

-- Starting backup...
Dumping database snipeit...
Determining files to backup...
Zipping 502 files and directories...
Created zip containing 502 files and directories. Size is 11.79 MB
Copying zip to disk named backup...
Successfully copied zip to disk named backup.
Backup completed!

--------------------------------------------------------
STEP 3: Putting application into maintenance mode:
--------------------------------------------------------

-- Application is now in maintenance mode.

--------------------------------------------------------
STEP 4: Pulling latest from Git (master branch):
--------------------------------------------------------

Git is installed.
Already on 'master'
error: The following untracked working tree files would be overwritten by merge:
        .env.docker
        .env.dusk.local
        .github/ISSUE_TEMPLATE/bug_report.yml
        .github/ISSUE_TEMPLATE/config.yml
        .github/ISSUE_TEMPLATE/feature_request.yml
        .github/dependabot.yml
        .github/workflows/SA-codeql.yml
        .github/workflows/codacy-analysis.yml
        .github/workflows/docker-alpine.yml
        .github/workflows/docker.yml
        Dockerfile.fpm-alpine
        Procfile
        SECURITY.md
        TESTING.md
        ansible/ubuntu/apachevirtualhost.conf.j2
        ansible/ubuntu/vagrant_playbook.yml
        app/Console/Commands/GeneratePersonalAccessToken.php
        app/Console/Commands/KillAllSessions.php
        app/Console/Commands/LdapTroubleshooter.php
        app/Console/Commands/RestoreFromBackup.php
        app/Helpers/StorageHelper.php
        app/Http/Controllers/Accessories/AccessoriesFilesController.php
        app/Http/Controllers/Api/LicenseSeatsController.php
        app/Http/Controllers/AssetModelsFilesController.php
        app/Http/Controllers/Components/ComponentsFilesController.php
        app/Http/Controllers/Consumables/ConsumablesFilesController.php
        app/Http/Controllers/HealthController.php
        app/Http/Livewire/CustomFieldSetDefaultValuesForModel.php
        app/Http/Livewire/LoginForm.php
        app/Http/Middleware/CheckUserIsActivated.php
        app/Http/Middleware/NoSessionStore.php
        app/Http/Middleware/PreventBackHistory.php
        app/Http/Middleware/PreventRequestsDuringMaintenance.php
        app/Http/Middleware/TrimStrings.php
        app/Http/Middleware/TrustHosts.php
        app/Http/Middleware/TrustProxies.php
        app/Http/Requests/SlackSettingsRequest.php
        app/Http/Traits/ConvertsBase64ToFiles.php
        app/Http/Traits/TwoColumnUniqueUndeletedTrait.php
        app/Http/Transformers/DepreciationReportTransformer.php
        app/Http/Transformers/PieChartTransformer.php
        app/Models/SCIMUser.php
        app/Models/SnipeSCIMConfig.php
        app/Notifications/AcceptanceAssetAcceptedNotification.php
        app/Notifications/AcceptanceAssetDeclinedNotification.php
        app/Policies/PredefinedKitPolicy.php
        app/Presenters/DepreciationReportPresenter.php
        app.json
        config/dompdf.php
        config/google2fa.php
        config/livewire.php
        config/scim.php
        database/factories/ActionlogFactory.php
        database/factories/AssetMaintenanceFactory.php
        database/factories/CompanyFactory.php
        database/factories/ComponentFactory.php
        database/factories/CustomFieldFactory.php
        database/factories/DepartmentFactory.php
        database/factories/GroupFactory.php
        database/factories/LocationFactory.php
        database/factories/SettingFactory.php
        database/factories/StatuslabelFactory.php
        database/factories/SupplierFactory.php
        database/migrations/2013_11_15_190357_create_temp_licenses_table.php
        database/migrations/2013_11_25_013244_recreate_licenses_table.php
        database/migrations/2019_04_06_060145_add_user_skin_setting.php
        database/migrations/2019_04_06_205355_add_setting_allow_user_skin.php
        database/migrations/2020_08_11_200712_add_saml_key_rollover.php
        database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php
        database/migrations/2020_12_18_090026_swap_target_type_index_order.php
        database/migrations/2020_12_21_153235_update_min_password.php
        database/migrations/2020_12_21_210105_fix_bad_ldap_server_url_for_v5.php
        database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php
        database/migrations/2021_03_18_184102_adds_several_ldap_fields.php
        database/migrations/2021_04_07_001811_add_ldap_dept.php
        database/migrations/2021_04_14_180125_add_ids_to_tables.php
        database/migrations/2021_06_07_155421_add_serial_number_indexes.php
        database/migrations/2021_06_07_155436_add_company_id_indexes.php
        database/migrations/2021_07_28_031345_add_client_side_l_d_a_p_cert_to_settings.php
        database/migrations/2021_07_28_040554_add_client_side_l_d_a_p_key_to_settings.php
        database/migrations/2021_08_11_005206_add_depreciation_minimum_value.php
        database/migrations/2021_08_24_124354_make_ldap_client_certs_nullable.php
        database/migrations/2021_09_20_183216_change_default_label_to_nullable.php
        database/migrations/2021_12_27_151849_change_supplier_address_length.php
        database/migrations/2022_01_10_182548_add_license_id_index_to_license_seats.php
        database/migratio
Aborting
-- No local changes to save
-- Your branch is behind 'origin/master' by 3312 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
-- Updating f1d0d1bfe..9c205f63a

--------------------------------------------------------
Step 5: Cleaning up old cached files:
--------------------------------------------------------

√ No bootstrap/cache/compiled.php, so nothing to delete.
√ No bootsrap/cache/services.php, so nothing to delete.
√ No bootstrap/cache/config.php, so nothing to delete.

-- Configuration cache cleared!
-- Application cache cleared!
-- Route cache cleared!
-- Compiled views cleared!

--------------------------------------------------------
Step 6: Updating composer dependencies:
(This may take a moment.)
--------------------------------------------------------

-- We couldn't find a local composer.phar. No worries, trying globally.

Warning: Ambiguous class resolution, "ReCreateLicensesTable" was found in both "/var/www/snipeit/database/migrations/2013_11_25_013244_recreate_licenses_table.php" and "/var/www/snipeit/database/migrations/2013_11_25_013244_create_licenses_table.php", the first will be used.
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
Installing dependencies from lock file
Verifying lock file contents can be installed on current platform.
Nothing to install, update or remove
Generating optimized autoload files
Warning: Ambiguous class resolution, "ReCreateLicensesTable" was found in both "/var/www/snipeit/database/migrations/2013_11_25_013244_recreate_licenses_table.php" and "/var/www/snipeit/database/migrations/2013_11_25_013244_create_licenses_table.php", the first will be used.
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
Generating optimized autoload files
Generated optimized autoload files containing 5602 classes

--------------------------------------------------------
Step 7: Migrating database:
--------------------------------------------------------

Nothing to migrate.

--------------------------------------------------------
Step 8: Checking for OAuth keys:
--------------------------------------------------------

√ OAuth keys detected. Skipping passport install.

--------------------------------------------------------
Step 9: Taking application out of maintenance mode:
--------------------------------------------------------

-- Application is now live.

---------------------- FINISHED! -----------------------
All done! Clear your browser cookies and re-login to use
your upgraded Snipe-IT!
--------------------------------------------------------

Ran php upgrade.php again after the previous comment with output. Here's the most recent output of that command after running the artisan commands you had me run. See above for changes and it aborting.

Should I try moving those files as well and try again?

Also, it references running git pull -- would that help any?

snipe commented 1 year ago

This is showing that things are kinda fucky, tbh.

error: The following untracked working tree files would be overwritten by merge:
        .env.docker
        .env.dusk.local
        .github/ISSUE_TEMPLATE/bug_report.yml
        .github/ISSUE_TEMPLATE/config.yml
        .github/ISSUE_TEMPLATE/feature_request.yml
        .github/dependabot.yml
        .github/workflows/SA-codeql.yml
        .github/workflows/codacy-analysis.yml
        .github/workflows/docker-alpine.yml
        .github/workflows/docker.yml
        Dockerfile.fpm-alpine
        Procfile
        SECURITY.md
        TESTING.md
        ansible/ubuntu/apachevirtualhost.conf.j2
        ansible/ubuntu/vagrant_playbook.yml
        app/Console/Commands/GeneratePersonalAccessToken.php
        app/Console/Commands/KillAllSessions.php
        app/Console/Commands/LdapTroubleshooter.php
        app/Console/Commands/RestoreFromBackup.php
        app/Helpers/StorageHelper.php
        app/Http/Controllers/Accessories/AccessoriesFilesController.php
        app/Http/Controllers/Api/LicenseSeatsController.php
        app/Http/Controllers/AssetModelsFilesController.php
        app/Http/Controllers/Components/ComponentsFilesController.php
        app/Http/Controllers/Consumables/ConsumablesFilesController.php
        app/Http/Controllers/HealthController.php
        app/Http/Livewire/CustomFieldSetDefaultValuesForModel.php
        app/Http/Livewire/LoginForm.php
        app/Http/Middleware/CheckUserIsActivated.php
        app/Http/Middleware/NoSessionStore.php
        app/Http/Middleware/PreventBackHistory.php
        app/Http/Middleware/PreventRequestsDuringMaintenance.php
        app/Http/Middleware/TrimStrings.php
        app/Http/Middleware/TrustHosts.php
        app/Http/Middleware/TrustProxies.php
        app/Http/Requests/SlackSettingsRequest.php
        app/Http/Traits/ConvertsBase64ToFiles.php
        app/Http/Traits/TwoColumnUniqueUndeletedTrait.php
        app/Http/Transformers/DepreciationReportTransformer.php
        app/Http/Transformers/PieChartTransformer.php
        app/Models/SCIMUser.php
        app/Models/SnipeSCIMConfig.php
        app/Notifications/AcceptanceAssetAcceptedNotification.php
        app/Notifications/AcceptanceAssetDeclinedNotification.php
        app/Policies/PredefinedKitPolicy.php
        app/Presenters/DepreciationReportPresenter.php
        app.json
        config/dompdf.php
        config/google2fa.php
        config/livewire.php
        config/scim.php
        database/factories/ActionlogFactory.php
        database/factories/AssetMaintenanceFactory.php
        database/factories/CompanyFactory.php
        database/factories/ComponentFactory.php
        database/factories/CustomFieldFactory.php
        database/factories/DepartmentFactory.php
        database/factories/GroupFactory.php
        database/factories/LocationFactory.php
        database/factories/SettingFactory.php
        database/factories/StatuslabelFactory.php
        database/factories/SupplierFactory.php
        database/migrations/2013_11_15_190357_create_temp_licenses_table.php
        database/migrations/2013_11_25_013244_recreate_licenses_table.php
        database/migrations/2019_04_06_060145_add_user_skin_setting.php
        database/migrations/2019_04_06_205355_add_setting_allow_user_skin.php
        database/migrations/2020_08_11_200712_add_saml_key_rollover.php
        database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php
        database/migrations/2020_12_18_090026_swap_target_type_index_order.php
        database/migrations/2020_12_21_153235_update_min_password.php
        database/migrations/2020_12_21_210105_fix_bad_ldap_server_url_for_v5.php
        database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php
        database/migrations/2021_03_18_184102_adds_several_ldap_fields.php
        database/migrations/2021_04_07_001811_add_ldap_dept.php
        database/migrations/2021_04_14_180125_add_ids_to_tables.php
        database/migrations/2021_06_07_155421_add_serial_number_indexes.php
        database/migrations/2021_06_07_155436_add_company_id_indexes.php
        database/migrations/2021_07_28_031345_add_client_side_l_d_a_p_cert_to_settings.php
        database/migrations/2021_07_28_040554_add_client_side_l_d_a_p_key_to_settings.php
        database/migrations/2021_08_11_005206_add_depreciation_minimum_value.php
        database/migrations/2021_08_24_124354_make_ldap_client_certs_nullable.php
        database/migrations/2021_09_20_183216_change_default_label_to_nullable.php
        database/migrations/2021_12_27_151849_change_supplier_address_length.php
        database/migrations/2022_01_10_182548_add_license_id_index_to_license_seats.php
        database/migratio
Aborting

For some reason, you have files in your local Snipe-IT that git thinks have been changed outside of git. I don't know why that is, but git thinks it's true, so for all practical purposes it is true.

What's weird here is that in your output above, it RAN those migrations. So... WTF.

Migrating: 2021_08_11_005206_add_depreciation_minimum_value
Migrated:  2021_08_11_005206_add_depreciation_minimum_value (0.08 seconds)

If it wasn't able to take those files, those migrations would never have run.

kwoodVisions commented 1 year ago

Things are definitely "fucky", that's for sure... I'm super confused!

snipe commented 1 year ago

(This is sometimes attributed to carriage returns/line breaks across operating systems, but I legit don't understand how those migrations ran at all.)

kwoodVisions commented 1 year ago

(This is sometimes attributed to carriage returns/line breaks across operating systems, but I legit don't understand how those migrations ran at all.)

Should I try moving all of the files it says are changed and see if that helps out? I have to head off to bed for now as it's past midnight and I need to get up early in the morning for work but if you have any thoughts on this, or what I can do to get past this, let me know and I will try them when I get up in the morning.

Again, thank you for your assistance thus far. Hopefully together we can figure out WTF is going on and fix these issues.

snipe commented 1 year ago

You have a backup, yeah? (You only need DB and uploaded files - the app itself will be alright.)

If so, let's try git reset --hard, then run the upgrade again. I promise this work will be worth it once we've got you sorted. Once we've unfucked this, upgrades will be so easy. This part sucks, but we'll get you through it.

kwoodVisions commented 1 year ago

OK -- I'll try this now, and yes I do have a backup in case things go haywire. I'll try that now and paste the outputs, then off to bed :D

kwoodVisions commented 1 year ago
snipeitapp@SNIPEIT:/var/www/snipeit$ git reset --hard
HEAD is now at f1d0d1bfe Merge remote-tracking branch 'origin/develop'

Output of git reset --hard...

...and here's the output of php upgrade.php:

snipeitapp@SNIPEIT:/var/www/snipeit$ php upgrade.php
--------------------------------------------------------
WELCOME TO THE SNIPE-IT UPGRADER!
--------------------------------------------------------

This script will attempt to:

- check your PHP version and extension requirements
- do a git pull to bring you to the latest version
- run composer install to get your vendors up to date
- run migrations to get your schema up to date
- clear out old cache settings

--------------------------------------------------------
STEP 1: Checking PHP requirements:
--------------------------------------------------------

Current PHP version: (7.4.33) is at least 7.2.0 - continuing...
FYI: The php.ini used by this PHP is: /etc/php/7.4/cli/php.ini

Checking Required PHP extensions...

√ bcmath is installed!
√ curl is installed!
√ fileinfo is installed!
√ gd is installed!
√ json is installed!
√ ldap is installed!
√ mbstring is installed!
√ mysqli is installed!
√ openssl is installed!
√ PDO is installed!
√ tokenizer is installed!
√ xml is installed!
√ zip is installed!

--------------------------------------------------------
STEP 2: Backing up database:
--------------------------------------------------------

-- Starting backup...
Dumping database snipeit...
Determining files to backup...
Zipping 502 files and directories...
Created zip containing 502 files and directories. Size is 11.79 MB
Copying zip to disk named backup...
Successfully copied zip to disk named backup.
Backup completed!

--------------------------------------------------------
STEP 3: Putting application into maintenance mode:
--------------------------------------------------------

-- Application is now in maintenance mode.

--------------------------------------------------------
STEP 4: Pulling latest from Git (master branch):
--------------------------------------------------------

Git is installed.
fatal: unable to access 'https://github.com/snipe/snipe-it/': Could not resolve host: github.com
Already on 'master'
error: The following untracked working tree files would be overwritten by merge:
        .env.docker
        .env.dusk.local
        .github/ISSUE_TEMPLATE/bug_report.yml
        .github/ISSUE_TEMPLATE/config.yml
        .github/ISSUE_TEMPLATE/feature_request.yml
        .github/dependabot.yml
        .github/workflows/SA-codeql.yml
        .github/workflows/codacy-analysis.yml
        .github/workflows/docker-alpine.yml
        .github/workflows/docker.yml
        Dockerfile.fpm-alpine
        Procfile
        SECURITY.md
        TESTING.md
        ansible/ubuntu/apachevirtualhost.conf.j2
        ansible/ubuntu/vagrant_playbook.yml
        app/Console/Commands/GeneratePersonalAccessToken.php
        app/Console/Commands/KillAllSessions.php
        app/Console/Commands/LdapTroubleshooter.php
        app/Console/Commands/RestoreFromBackup.php
        app/Helpers/StorageHelper.php
        app/Http/Controllers/Accessories/AccessoriesFilesController.php
        app/Http/Controllers/Api/LicenseSeatsController.php
        app/Http/Controllers/AssetModelsFilesController.php
        app/Http/Controllers/Components/ComponentsFilesController.php
        app/Http/Controllers/Consumables/ConsumablesFilesController.php
        app/Http/Controllers/HealthController.php
        app/Http/Livewire/CustomFieldSetDefaultValuesForModel.php
        app/Http/Livewire/LoginForm.php
        app/Http/Middleware/CheckUserIsActivated.php
        app/Http/Middleware/NoSessionStore.php
        app/Http/Middleware/PreventBackHistory.php
        app/Http/Middleware/PreventRequestsDuringMaintenance.php
        app/Http/Middleware/TrimStrings.php
        app/Http/Middleware/TrustHosts.php
        app/Http/Middleware/TrustProxies.php
        app/Http/Requests/SlackSettingsRequest.php
        app/Http/Traits/ConvertsBase64ToFiles.php
        app/Http/Traits/TwoColumnUniqueUndeletedTrait.php
        app/Http/Transformers/DepreciationReportTransformer.php
        app/Http/Transformers/PieChartTransformer.php
        app/Models/SCIMUser.php
        app/Models/SnipeSCIMConfig.php
        app/Notifications/AcceptanceAssetAcceptedNotification.php
        app/Notifications/AcceptanceAssetDeclinedNotification.php
        app/Policies/PredefinedKitPolicy.php
        app/Presenters/DepreciationReportPresenter.php
        app.json
        config/dompdf.php
        config/google2fa.php
        config/livewire.php
        config/scim.php
        database/factories/ActionlogFactory.php
        database/factories/AssetMaintenanceFactory.php
        database/factories/CompanyFactory.php
        database/factories/ComponentFactory.php
        database/factories/CustomFieldFactory.php
        database/factories/DepartmentFactory.php
        database/factories/GroupFactory.php
        database/factories/LocationFactory.php
        database/factories/SettingFactory.php
        database/factories/StatuslabelFactory.php
        database/factories/SupplierFactory.php
        database/migrations/2013_11_15_190357_create_temp_licenses_table.php
        database/migrations/2013_11_25_013244_recreate_licenses_table.php
        database/migrations/2019_04_06_060145_add_user_skin_setting.php
        database/migrations/2019_04_06_205355_add_setting_allow_user_skin.php
        database/migrations/2020_08_11_200712_add_saml_key_rollover.php
        database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php
        database/migrations/2020_12_18_090026_swap_target_type_index_order.php
        database/migrations/2020_12_21_153235_update_min_password.php
        database/migrations/2020_12_21_210105_fix_bad_ldap_server_url_for_v5.php
        database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php
        database/migrations/2021_03_18_184102_adds_several_ldap_fields.php
        database/migrations/2021_04_07_001811_add_ldap_dept.php
        database/migrations/2021_04_14_180125_add_ids_to_tables.php
        database/migrations/2021_06_07_155421_add_serial_number_indexes.php
        database/migrations/2021_06_07_155436_add_company_id_indexes.php
        database/migrations/2021_07_28_031345_add_client_side_l_d_a_p_cert_to_settings.php
        database/migrations/2021_07_28_040554_add_client_side_l_d_a_p_key_to_settings.php
        database/migrations/2021_08_11_005206_add_depreciation_minimum_value.php
        database/migrations/2021_08_24_124354_make_ldap_client_certs_nullable.php
        database/migrations/2021_09_20_183216_change_default_label_to_nullable.php
        database/migrations/2021_12_27_151849_change_supplier_address_length.php
        database/migrations/2022_01_10_182548_add_license_id_index_to_license_seats.php
        database/migratio
Aborting
-- No local changes to save
-- Your branch is behind 'origin/master' by 3312 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
-- Updating f1d0d1bfe..9c205f63a

--------------------------------------------------------
Step 5: Cleaning up old cached files:
--------------------------------------------------------

√ No bootstrap/cache/compiled.php, so nothing to delete.
√ No bootsrap/cache/services.php, so nothing to delete.
√ No bootstrap/cache/config.php, so nothing to delete.

-- Configuration cache cleared!
-- Application cache cleared!
-- Route cache cleared!
-- Compiled views cleared!

--------------------------------------------------------
Step 6: Updating composer dependencies:
(This may take a moment.)
--------------------------------------------------------

-- We couldn't find a local composer.phar. No worries, trying globally.

Warning: Ambiguous class resolution, "ReCreateLicensesTable" was found in both "/var/www/snipeit/database/migrations/2013_11_25_013244_recreate_licenses_table.php" and "/var/www/snipeit/database/migrations/2013_11_25_013244_create_licenses_table.php", the first will be used.
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
Installing dependencies from lock file
Verifying lock file contents can be installed on current platform.
Nothing to install, update or remove
Generating optimized autoload files
Warning: Ambiguous class resolution, "ReCreateLicensesTable" was found in both "/var/www/snipeit/database/migrations/2013_11_25_013244_recreate_licenses_table.php" and "/var/www/snipeit/database/migrations/2013_11_25_013244_create_licenses_table.php", the first will be used.
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
Generating optimized autoload files
Generated optimized autoload files containing 5602 classes

--------------------------------------------------------
Step 7: Migrating database:
--------------------------------------------------------

Nothing to migrate.

--------------------------------------------------------
Step 8: Checking for OAuth keys:
--------------------------------------------------------

√ OAuth keys detected. Skipping passport install.

--------------------------------------------------------
Step 9: Taking application out of maintenance mode:
--------------------------------------------------------

-- Application is now live.

---------------------- FINISHED! -----------------------
All done! Clear your browser cookies and re-login to use
your upgraded Snipe-IT!
--------------------------------------------------------
snipe commented 1 year ago

CRAP.

fatal: unable to access 'https://github.com/snipe/snipe-it/': Could not resolve host: github.com

We've seen this a few times in this thread and I think I'd like to figure out what's happening there. This isn't going to be great. Any funky DNS stuff you have going on? Network level restrictions? I wouldn't have thought so, because you're clearly pulling data down from GH, but we keep seeing this error.

It's late here too - we can pick it up tomorrow, but even if we have to wipe the entire local directory (we'll save uploads and oauth stuff so you can restore properly).

GitHub
GitHub - snipe/snipe-it: A free open source IT asset/license management system
A free open source IT asset/license management system - GitHub - snipe/snipe-it: A free open source IT asset/license management system
kwoodVisions commented 1 year ago

I think the git network issue was intermittent. I ran the command again and didn't get that fatal error. I still do see errors about files that would be overwritten and am still confused about that. Here's the latest output:

--------------------------------------------------------
WELCOME TO THE SNIPE-IT UPGRADER!
--------------------------------------------------------

This script will attempt to:

- check your PHP version and extension requirements
- do a git pull to bring you to the latest version
- run composer install to get your vendors up to date
- run migrations to get your schema up to date
- clear out old cache settings

--------------------------------------------------------
STEP 1: Checking PHP requirements:
--------------------------------------------------------

Current PHP version: (7.4.33) is at least 7.2.0 - continuing...
FYI: The php.ini used by this PHP is: /etc/php/7.4/cli/php.ini

Checking Required PHP extensions...

√ bcmath is installed!
√ curl is installed!
√ fileinfo is installed!
√ gd is installed!
√ json is installed!
√ ldap is installed!
√ mbstring is installed!
√ mysqli is installed!
√ openssl is installed!
√ PDO is installed!
√ tokenizer is installed!
√ xml is installed!
√ zip is installed!

--------------------------------------------------------
STEP 2: Backing up database:
--------------------------------------------------------

^[[28~-- Starting backup...
Dumping database snipeit...
Determining files to backup...
Zipping 502 files and directories...
Created zip containing 502 files and directories. Size is 11.79 MB
Copying zip to disk named backup...
Successfully copied zip to disk named backup.
Backup completed!

--------------------------------------------------------
STEP 3: Putting application into maintenance mode:
--------------------------------------------------------

-- Application is now in maintenance mode.

--------------------------------------------------------
STEP 4: Pulling latest from Git (master branch):
--------------------------------------------------------

Git is installed.
Already on 'master'
error: The following untracked working tree files would be overwritten by merge:
        .env.docker
        .env.dusk.local
        .github/ISSUE_TEMPLATE/bug_report.yml
        .github/ISSUE_TEMPLATE/config.yml
        .github/ISSUE_TEMPLATE/feature_request.yml
        .github/dependabot.yml
        .github/workflows/SA-codeql.yml
        .github/workflows/codacy-analysis.yml
        .github/workflows/docker-alpine.yml
        .github/workflows/docker.yml
        Dockerfile.fpm-alpine
        Procfile
        SECURITY.md
        TESTING.md
        ansible/ubuntu/apachevirtualhost.conf.j2
        ansible/ubuntu/vagrant_playbook.yml
        app/Console/Commands/GeneratePersonalAccessToken.php
        app/Console/Commands/KillAllSessions.php
        app/Console/Commands/LdapTroubleshooter.php
        app/Console/Commands/RestoreFromBackup.php
        app/Helpers/StorageHelper.php
        app/Http/Controllers/Accessories/AccessoriesFilesController.php
        app/Http/Controllers/Api/LicenseSeatsController.php
        app/Http/Controllers/AssetModelsFilesController.php
        app/Http/Controllers/Components/ComponentsFilesController.php
        app/Http/Controllers/Consumables/ConsumablesFilesController.php
        app/Http/Controllers/HealthController.php
        app/Http/Livewire/CustomFieldSetDefaultValuesForModel.php
        app/Http/Livewire/LoginForm.php
        app/Http/Middleware/CheckUserIsActivated.php
        app/Http/Middleware/NoSessionStore.php
        app/Http/Middleware/PreventBackHistory.php
        app/Http/Middleware/PreventRequestsDuringMaintenance.php
        app/Http/Middleware/TrimStrings.php
        app/Http/Middleware/TrustHosts.php
        app/Http/Middleware/TrustProxies.php
        app/Http/Requests/SlackSettingsRequest.php
        app/Http/Traits/ConvertsBase64ToFiles.php
        app/Http/Traits/TwoColumnUniqueUndeletedTrait.php
        app/Http/Transformers/DepreciationReportTransformer.php
        app/Http/Transformers/PieChartTransformer.php
        app/Models/SCIMUser.php
        app/Models/SnipeSCIMConfig.php
        app/Notifications/AcceptanceAssetAcceptedNotification.php
        app/Notifications/AcceptanceAssetDeclinedNotification.php
        app/Policies/PredefinedKitPolicy.php
        app/Presenters/DepreciationReportPresenter.php
        app.json
        config/dompdf.php
        config/google2fa.php
        config/livewire.php
        config/scim.php
        database/factories/ActionlogFactory.php
        database/factories/AssetMaintenanceFactory.php
        database/factories/CompanyFactory.php
        database/factories/ComponentFactory.php
        database/factories/CustomFieldFactory.php
        database/factories/DepartmentFactory.php
        database/factories/GroupFactory.php
        database/factories/LocationFactory.php
        database/factories/SettingFactory.php
        database/factories/StatuslabelFactory.php
        database/factories/SupplierFactory.php
        database/migrations/2013_11_15_190357_create_temp_licenses_table.php
        database/migrations/2013_11_25_013244_recreate_licenses_table.php
        database/migrations/2019_04_06_060145_add_user_skin_setting.php
        database/migrations/2019_04_06_205355_add_setting_allow_user_skin.php
        database/migrations/2020_08_11_200712_add_saml_key_rollover.php
        database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php
        database/migrations/2020_12_18_090026_swap_target_type_index_order.php
        database/migrations/2020_12_21_153235_update_min_password.php
        database/migrations/2020_12_21_210105_fix_bad_ldap_server_url_for_v5.php
        database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php
        database/migrations/2021_03_18_184102_adds_several_ldap_fields.php
        database/migrations/2021_04_07_001811_add_ldap_dept.php
        database/migrations/2021_04_14_180125_add_ids_to_tables.php
        database/migrations/2021_06_07_155421_add_serial_number_indexes.php
        database/migrations/2021_06_07_155436_add_company_id_indexes.php
        database/migrations/2021_07_28_031345_add_client_side_l_d_a_p_cert_to_settings.php
        database/migrations/2021_07_28_040554_add_client_side_l_d_a_p_key_to_settings.php
        database/migrations/2021_08_11_005206_add_depreciation_minimum_value.php
        database/migrations/2021_08_24_124354_make_ldap_client_certs_nullable.php
        database/migrations/2021_09_20_183216_change_default_label_to_nullable.php
        database/migrations/2021_12_27_151849_change_supplier_address_length.php
        database/migrations/2022_01_10_182548_add_license_id_index_to_license_seats.php
        database/migratio
Aborting
-- No local changes to save
-- Your branch is behind 'origin/master' by 3312 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
-- Updating f1d0d1bfe..9c205f63a

--------------------------------------------------------
Step 5: Cleaning up old cached files:
--------------------------------------------------------

√ No bootstrap/cache/compiled.php, so nothing to delete.
√ No bootsrap/cache/services.php, so nothing to delete.
√ No bootstrap/cache/config.php, so nothing to delete.

-- Configuration cache cleared!
-- Application cache cleared!
-- Route cache cleared!
-- Compiled views cleared!

--------------------------------------------------------
Step 6: Updating composer dependencies:
(This may take a moment.)
--------------------------------------------------------

-- We couldn't find a local composer.phar. No worries, trying globally.

Warning: Ambiguous class resolution, "ReCreateLicensesTable" was found in both "/var/www/snipeit/database/migrations/2013_11_25_013244_recreate_licenses_table.php" and "/var/www/snipeit/database/migrations/2013_11_25_013244_create_licenses_table.php", the first will be used.
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
Installing dependencies from lock file
Verifying lock file contents can be installed on current platform.
Nothing to install, update or remove
Generating optimized autoload files
Warning: Ambiguous class resolution, "ReCreateLicensesTable" was found in both "/var/www/snipeit/database/migrations/2013_11_25_013244_recreate_licenses_table.php" and "/var/www/snipeit/database/migrations/2013_11_25_013244_create_licenses_table.php", the first will be used.
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
Generating optimized autoload files
Generated optimized autoload files containing 5602 classes

--------------------------------------------------------
Step 7: Migrating database:
--------------------------------------------------------

Nothing to migrate.

--------------------------------------------------------
Step 8: Checking for OAuth keys:
--------------------------------------------------------

√ OAuth keys detected. Skipping passport install.

--------------------------------------------------------
Step 9: Taking application out of maintenance mode:
--------------------------------------------------------

-- Application is now live.

---------------------- FINISHED! -----------------------
All done! Clear your browser cookies and re-login to use
your upgraded Snipe-IT!
--------------------------------------------------------
kwoodVisions commented 1 year ago

Any new thoughts on this? Would doing "git pull" actually do anything to help out and force the update to the latest branch?

snipe commented 1 year ago

Let's try this? https://stackoverflow.com/questions/1125968/how-do-i-force-git-pull-to-overwrite-local-files

Make sure you have a backup of course.

Stack Overflow
How do I force "git pull" to overwrite local files?
How do I force an overwrite of local files on a git pull? My local repository contains a file of the same filename as on the server. error: Untracked working tree file 'example.txt' would be overw...
kwoodVisions commented 1 year ago

HOT DAMN THAT WORKED!

Okay, so .... first, I tried the git reset command and found some odd files/folders nested in the /var/www/snipeit folder I had that had messed up permissions. So, the steps I took to resolve everything:

Now, the version on the site is showing v6.0.13 - build 8923 (master) !!!! :)

Thank you for all of your help on this!!

For reference, here is the output of the php upgrade.php command -- take a look to see if you see anything out of the norm and let me know when you have time.

--------------------------------------------------------
WELCOME TO THE SNIPE-IT UPGRADER!
--------------------------------------------------------

This script will attempt to:

- validate some very basic .env file settings
- check your PHP version and extension requirements
- check directory permissions
- do a git pull to bring you to the latest version
- run composer install to get your vendors up to date
- run migrations to get your schema up to date
- clear out old cache settings

--------------------------------------------------------
STEP 1: Checking .env file:
- Your .env is located at /var/www/snipeit/.env
--------------------------------------------------------

√ Your APP_KEY is not blank.
√ Your APP_URL is not null or blank. It is set to https://snipeit
√ Your APP_URL is set to https://snipeit and starts with the protocol (https:// or http://)
√ Your APP_URL (https://snipeit) does not have a trailing slash.

--------------------------------------------------------
STEP 2: Checking PHP requirements:
--------------------------------------------------------

Current PHP version: (7.4.33) is at least 7.4.0 - continuing...
FYI: The php.ini used by this PHP is: /etc/php/7.4/cli/php.ini

Checking Required PHP extensions...

√ bcmath is installed!
√ curl is installed!
√ fileinfo is installed!
√ gd is installed!
√ json is installed!
√ ldap is installed!
√ mbstring is installed!
√ mysqli is installed!
√ openssl is installed!
√ PDO is installed!
√ sodium is installed!
√ tokenizer is installed!
√ xml is installed!
√ zip is installed!

--------------------------------------------------------
STEP 3: Checking directory permissions:
--------------------------------------------------------

√ /var/www/snipeit/bootstrap/cache is writable
√ /var/www/snipeit/storage is writable
√ /var/www/snipeit/storage/logs is writable
√ /var/www/snipeit/storage/logs/laravel.log is writable
√ /var/www/snipeit/storage/framework is writable
√ /var/www/snipeit/storage/framework/cache is writable
√ /var/www/snipeit/storage/framework/sessions is writable
√ /var/www/snipeit/storage/framework/views is writable
√ /var/www/snipeit/storage/app is writable
√ /var/www/snipeit/storage/app/backups is writable
√ /var/www/snipeit/storage/app/backup-temp is writable
√ /var/www/snipeit/storage/private_uploads is writable
√ /var/www/snipeit/public/uploads is writable

--------------------------------------------------------
STEP 4: Backing up database:
--------------------------------------------------------

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--------------------------------------------------------
STEP 5: Putting application into maintenance mode:
--------------------------------------------------------

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--------------------------------------------------------
STEP 6: Pulling latest from Git (master branch):
--------------------------------------------------------

Git is installed.
Already on 'master'
-- No local changes to save
-- Your branch is up to date with 'origin/master'.
-- Already up to date.

--------------------------------------------------------
STEP 7: Cleaning up old cached files:
--------------------------------------------------------

√ No bootstrap/cache/compiled.php, so nothing to delete.
√ Deleting bootstrap/cache/services.php. It is no longer used.
√ No bootstrap/cache/config.php, so nothing to delete.
√ Deleting vendor/symfony/translation/TranslatorInterface.php. It is no longer used.

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--
In ProviderRepository.php line 208:

  Class 'Barryvdh\DomPDF\ServiceProvider' not found

--------------------------------------------------------
STEP 8: Updating composer dependencies:
(This may take a moment.)
--------------------------------------------------------

-- Running the app in production mode.
-- We couldn't find a local composer.phar. No worries, trying globally.
Since you are running composer globally, we won't try to update it for you.
If you run into issues with this step, try running `composer self-update`
before running this updater again

Installing dependencies from lock file
Verifying lock file contents can be installed on current platform.
Package operations: 51 installs, 103 updates, 10 removals
  - Syncing symfony/deprecation-contracts (v2.5.2) into cache
  - Syncing psr/http-client (1.0.1) into cache
  - Syncing guzzlehttp/psr7 (2.4.0) into cache
  - Syncing guzzlehttp/promises (1.5.1) into cache
  - Syncing guzzlehttp/guzzle (7.4.5) into cache
  - Syncing symfony/polyfill-mbstring (v1.26.0) into cache
  - Syncing alek13/slack (2.2.1) into cache
  - Syncing tmilos/scim-schema (0.1) into cache
  - Syncing tmilos/value (1.0.2) into cache
  - Syncing tmilos/lexer (1.0.2) into cache
  - Syncing tmilos/scim-filter-parser (1.3.0) into cache
  - Syncing voku/portable-ascii (1.6.1) into cache
  - Syncing symfony/polyfill-php80 (v1.26.0) into cache
  - Syncing symfony/polyfill-ctype (v1.26.0) into cache
  - Syncing phpoption/phpoption (1.8.1) into cache
  - Syncing graham-campbell/result-type (v1.0.4) into cache
  - Syncing vlucas/phpdotenv (v5.4.1) into cache
  - Syncing symfony/css-selector (v4.4.37) into cache
  - Syncing tijsverkoyen/css-to-inline-styles (2.2.4) into cache
  - Syncing symfony/var-dumper (v5.4.9) into cache
  - Syncing symfony/routing (v5.4.8) into cache
  - Syncing symfony/process (v5.4.8) into cache
  - Syncing symfony/polyfill-php72 (v1.26.0) into cache
  - Syncing symfony/polyfill-intl-normalizer (v1.26.0) into cache
  - Syncing symfony/polyfill-intl-idn (v1.26.0) into cache
  - Syncing symfony/mime (v5.4.10) into cache
  - Syncing symfony/polyfill-php73 (v1.26.0) into cache
  - Syncing symfony/http-foundation (v5.4.10) into cache
  - Syncing psr/event-dispatcher (1.0.0) into cache
  - Syncing symfony/event-dispatcher-contracts (v2.5.2) into cache
  - Syncing symfony/event-dispatcher (v5.4.9) into cache
  - Syncing psr/log (1.1.4) into cache
  - Syncing symfony/error-handler (v5.4.9) into cache
  - Syncing symfony/http-kernel (v5.4.10) into cache
  - Syncing symfony/finder (v5.4.8) into cache
  - Syncing symfony/polyfill-intl-grapheme (v1.26.0) into cache
  - Syncing symfony/string (v5.4.10) into cache
  - Syncing psr/container (1.1.2) into cache
  - Syncing symfony/service-contracts (v2.5.2) into cache
  - Syncing symfony/console (v5.4.10) into cache
  - Syncing symfony/polyfill-iconv (v1.26.0) into cache
  - Syncing doctrine/lexer (1.2.3) into cache
  - Syncing egulias/email-validator (2.1.25) into cache
  - Syncing swiftmailer/swiftmailer (v6.3.0) into cache
  - Syncing symfony/polyfill-php81 (v1.26.0) into cache
  - Syncing ramsey/collection (1.2.2) into cache
  - Syncing brick/math (0.9.3) into cache
  - Syncing ramsey/uuid (4.2.3) into cache
  - Syncing opis/closure (3.6.3) into cache
  - Syncing symfony/translation-contracts (v2.5.2) into cache
  - Syncing symfony/translation (v5.4.9) into cache
  - Syncing nesbot/carbon (2.59.1) into cache
  - Syncing monolog/monolog (2.7.0) into cache
  - Syncing league/mime-type-detection (1.11.0) into cache
  - Syncing league/flysystem (1.1.9) into cache
  - Syncing nette/utils (v3.2.7) into cache
  - Syncing nette/schema (v1.2.2) into cache
  - Syncing dflydev/dot-access-data (v3.0.1) into cache
  - Syncing league/config (v1.1.1) into cache
  - Syncing league/commonmark (2.3.4) into cache
  - Syncing laravel/serializable-closure (v1.2.0) into cache
  - Syncing webmozart/assert (1.11.0) into cache
  - Syncing dragonmantank/cron-expression (v3.3.1) into cache
  - Syncing doctrine/inflector (1.4.4) into cache
  - Syncing laravel/framework (v8.83.22) into cache
  - Syncing arietimmerman/laravel-scim-server (dev-master 2c7ecc4) into cache
  - Syncing aws/aws-crt-php (v1.0.2) into cache
  - Syncing maximebf/debugbar (v1.18.0) into cache
  - Syncing barryvdh/laravel-debugbar (v3.7.0) into cache
  - Syncing sabberworm/php-css-parser (8.4.0) into cache
  - Syncing phenx/php-svg-lib (0.4.1) into cache
  - Syncing phenx/php-font-lib (0.5.4) into cache
  - Syncing masterminds/html5 (2.7.5) into cache
  - Syncing dompdf/dompdf (v2.0.0) into cache
  - Syncing barryvdh/laravel-dompdf (v2.0.0) into cache
  - Syncing dasprid/enum (1.0.3) into cache
  - Syncing doctrine/annotations (1.13.3) into cache
  - Syncing doctrine/reflection (1.2.3) into cache
  - Syncing doctrine/event-manager (1.1.1) into cache
  - Syncing doctrine/collections (1.6.8) into cache
  - Syncing doctrine/cache (1.13.0) into cache
  - Syncing doctrine/persistence (1.3.8) into cache
  - Syncing doctrine/common (2.13.3) into cache
  - Syncing doctrine/deprecations (v1.0.0) into cache
  - Syncing doctrine/dbal (3.3.7) into cache
  - Syncing squizlabs/php_codesniffer (3.7.1) into cache
  - Syncing eduardokum/laravel-mail-auto-embed (1.0.7) into cache
  - Syncing enshrined/svg-sanitize (0.15.4) into cache
  - Syncing facade/ignition-contracts (1.0.2) into cache
  - Syncing facade/flare-client-php (1.9.1) into cache
  - Syncing facade/ignition (2.17.6) into cache
  - Syncing fideloper/proxy (4.4.2) into cache
  - Syncing asm89/stack-cors (v2.1.1) into cache
  - Syncing fruitcake/laravel-cors (v2.2.0) into cache
  - Syncing intervention/image (2.7.2) into cache
  - Syncing laravel/helpers (v1.5.0) into cache
  - Syncing symfony/psr-http-message-bridge (v2.1.2) into cache
  - Syncing paragonie/random_compat (v9.99.100) into cache
  - Syncing paragonie/constant_time_encoding (v2.6.3) into cache
  - Syncing phpseclib/phpseclib (3.0.14) into cache
  - Syncing nyholm/psr7 (1.5.1) into cache
  - Syncing league/uri-interfaces (2.3.0) into cache
  - Syncing league/uri (6.7.1) into cache
  - Syncing lcobucci/clock (2.0.0) into cache
  - Syncing lcobucci/jwt (4.1.5) into cache
  - Syncing defuse/php-encryption (v2.3.1) into cache
  - Syncing league/oauth2-server (8.3.5) into cache
  - Syncing firebase/php-jwt (v6.3.0) into cache
  - Syncing laravel/passport (v10.4.1) into cache
  - Syncing laravel/slack-notification-channel (v2.4.0) into cache
  - Syncing nikic/php-parser (v4.14.0) into cache
  - Syncing psy/psysh (v0.11.7) into cache
  - Syncing laravel/tinker (v2.7.2) into cache
  - Syncing laravel/ui (v3.4.6) into cache
  - Syncing laravelcollective/html (v6.3.0) into cache
  - Syncing league/csv (9.8.0) into cache
  - Syncing mtdowling/jmespath.php (2.6.1) into cache
  - Syncing aws/aws-sdk-php (3.231.12) into cache
  - Syncing league/flysystem-aws-s3-v3 (1.0.30) into cache
  - Syncing league/flysystem-cached-adapter (1.1.0) into cache
  - Syncing markbaker/matrix (3.0.0) into cache
  - Syncing markbaker/complex (3.0.1) into cache
  - Syncing myclabs/php-enum (1.8.3) into cache
  - Syncing maennchen/zipstream-php (2.2.1) into cache
  - Syncing ezyang/htmlpurifier (v4.14.0) into cache
  - Syncing phpoffice/phpspreadsheet (1.24.1) into cache
  - Syncing maatwebsite/excel (3.1.40) into cache
  - Syncing livewire/livewire (v2.10.6) into cache
  - Syncing mediconesystems/livewire-datatables (v0.5.4) into cache
  - Syncing filp/whoops (2.14.5) into cache
  - Syncing nunomaduro/collision (v5.11.0) into cache
  - Syncing robrichards/xmlseclibs (3.1.1) into cache
  - Syncing onelogin/php-saml (3.6.1) into cache
  - Syncing phpdocumentor/reflection-common (2.2.0) into cache
  - Syncing phpdocumentor/type-resolver (1.6.1) into cache
  - Syncing sebastian/recursion-context (4.0.4) into cache
  - Syncing sebastian/exporter (4.0.4) into cache
  - Syncing sebastian/diff (4.0.4) into cache
  - Syncing sebastian/comparator (4.0.6) into cache
  - Syncing phpdocumentor/reflection-docblock (5.3.0) into cache
  - Syncing doctrine/instantiator (1.4.1) into cache
  - Syncing phpspec/prophecy (v1.15.0) into cache
  - Syncing pragmarx/google2fa (v8.0.1) into cache
  - Syncing bacon/bacon-qr-code (2.0.7) into cache
  - Syncing pragmarx/google2fa-laravel (v1.4.1) into cache
  - Syncing rollbar/rollbar (v2.1.0) into cache
  - Syncing rollbar/rollbar-laravel (v7.2.0) into cache
  - Syncing spatie/temporary-directory (1.3.0) into cache
  - Syncing spatie/db-dumper (2.21.1) into cache
  - Syncing spatie/laravel-backup (6.16.5) into cache
  - Syncing tecnickcom/tc-lib-color (1.14.14) into cache
  - Syncing tecnickcom/tc-lib-barcode (1.17.14) into cache
  - Syncing unicodeveloper/laravel-password (1.0.4) into cache
  - Syncing watson/validating (6.1.1) into cache
    0 [>---------------------------]    0 [->--------------------------]
  - Removing tightenco/ziggy (v0.9.0)
  - Removing tightenco/collect (v7.6.1)
  - Removing symfony/debug (v4.4.7)
  - Removing patchwork/utf8 (v1.3.2)
  - Removing maknz/slack (1.7.0)
  - Removing laminas/laminas-zendframework-bridge (1.0.3)
  - Removing laminas/laminas-diactoros (2.2.3)
  - Removing dnoegel/php-xdg-base-dir (v0.1.1)
  - Removing barryvdh/laravel-cors (v0.11.4)
  - Removing adldap2/adldap2 (v10.2.3)
  - Installing symfony/deprecation-contracts (v2.5.2): Cloning e8b495ea28 from cache
  - Installing psr/http-client (1.0.1): Cloning 2dfb5f6c5e from cache
  - Upgrading guzzlehttp/psr7 (1.6.1 => 2.4.0): Checking out 13388f0095 from cache
  - Upgrading guzzlehttp/promises (v1.3.1 => 1.5.1): Checking out fe752aedc9 from cache
  - Upgrading guzzlehttp/guzzle (6.5.3 => 7.4.5): Checking out 1dd98b0564 from cache
  - Upgrading symfony/polyfill-mbstring (v1.15.0 => v1.26.0): Checking out 9344f9cb97 from cache
  - Installing alek13/slack (2.2.1): Cloning 9222449402 from cache
  - Installing tmilos/scim-schema (0.1): Cloning bb871e667b from cache
  - Installing tmilos/value (1.0.2): Cloning 9e78ad9c02 from cache
  - Installing tmilos/lexer (1.0.2): Cloning e788559561 from cache
  - Installing tmilos/scim-filter-parser (1.3.0): Cloning cfd9ba1f33 from cache
  - Installing voku/portable-ascii (1.6.1): Cloning 87337c91b9 from cache
  - Installing symfony/polyfill-php80 (v1.26.0): Cloning cfa0ae9884 from cache
  - Upgrading symfony/polyfill-ctype (v1.15.0 => v1.26.0): Checking out 6fd1b9a79f from cache
  - Upgrading phpoption/phpoption (1.7.3 => 1.8.1): Checking out eab7a0df01 from cache
  - Installing graham-campbell/result-type (v1.0.4): Cloning 0690bde053 from cache
  - Upgrading vlucas/phpdotenv (v3.6.3 => v5.4.1): Checking out 264dce589e from cache
  - Upgrading symfony/css-selector (v4.4.7 => v4.4.37): Checking out 0628e6c6d7 from cache
  - Upgrading tijsverkoyen/css-to-inline-styles (2.2.2 => 2.2.4): Checking out da444caae6 from cache
  - Upgrading symfony/var-dumper (v4.4.7 => v5.4.9): Checking out af52239a33 from cache
  - Upgrading symfony/routing (v4.4.7 => v5.4.8): Checking out e07817bb62 from cache
  - Upgrading symfony/process (v4.4.7 => v5.4.8): Checking out 597f3fff8e from cache
  - Upgrading symfony/polyfill-php72 (v1.15.0 => v1.26.0): Checking out bf44a9fd41 from cache
  - Installing symfony/polyfill-intl-normalizer (v1.26.0): Cloning 219aa369ce from cache
  - Upgrading symfony/polyfill-intl-idn (v1.15.0 => v1.26.0): Checking out 59a8d271f0 from cache
  - Upgrading symfony/mime (v4.4.7 => v5.4.10): Checking out 02265e1e51 from cache
  - Upgrading symfony/polyfill-php73 (v1.15.0 => v1.26.0): Checking out e440d35fa0 from cache
  - Upgrading symfony/http-foundation (v4.4.7 => v5.4.10): Checking out e7793b7906 from cache
  - Installing psr/event-dispatcher (1.0.0): Cloning dbefd12671 from cache
  - Upgrading symfony/event-dispatcher-contracts (v1.1.7 => v2.5.2): Checking out f98b54df6a from cache
  - Upgrading symfony/event-dispatcher (v4.4.7 => v5.4.9): Checking out 8e6ce1cc02 from cache
  - Upgrading psr/log (1.1.3 => 1.1.4): Checking out d49695b909 from cache
  - Upgrading symfony/error-handler (v4.4.7 => v5.4.9): Checking out c116cda1f5 from cache
  - Upgrading symfony/http-kernel (v4.4.7 => v5.4.10): Checking out 255ae3b0a4 from cache
  - Upgrading symfony/finder (v4.4.7 => v5.4.8): Checking out 9b630f3427 from cache
  - Installing symfony/polyfill-intl-grapheme (v1.26.0): Cloning 433d05519c from cache
  - Installing symfony/string (v5.4.10): Cloning 4432bc7df8 from cache
  - Upgrading psr/container (1.0.0 => 1.1.2): Checking out 513e0666f7 from cache
  - Upgrading symfony/service-contracts (v1.1.8 => v2.5.2): Checking out 4b426aac47 from cache
  - Upgrading symfony/console (v4.4.7 => v5.4.10): Checking out 4d671ab4dd from cache
  - Upgrading symfony/polyfill-iconv (v1.15.0 => v1.26.0): Checking out 143f1881e6 from cache
  - Upgrading doctrine/lexer (1.2.0 => 1.2.3): Checking out c268e882d4 from cache
  - Upgrading egulias/email-validator (2.1.17 => 2.1.25): Checking out 0dbf5d7845 from cache
  - Upgrading swiftmailer/swiftmailer (v6.2.3 => v6.3.0): Checking out 8a5d5072dc from cache
  - Installing symfony/polyfill-php81 (v1.26.0): Cloning 13f6d1271c from cache
  - Installing ramsey/collection (1.2.2): Cloning cccc74ee5e from cache
  - Installing brick/math (0.9.3): Cloning ca57d18f02 from cache
  - Upgrading ramsey/uuid (3.9.3 => 4.2.3): Checking out fc9bb7fb53 from cache
  - Upgrading opis/closure (3.5.1 => 3.6.3): Checking out 3d81e4309d from cache
  - Upgrading symfony/translation-contracts (v1.1.7 => v2.5.2): Checking out 136b19dd05 from cache
    symfony/translation has modified files:
    D TranslatorInterface.php
    Discard changes [y,n,v,d,s,?]? ?
    y - discard changes and apply the update
    n - abort the update and let you manually clean things up
    v - view modified files
    d - view local modifications (diff)
    s - stash changes and try to reapply them after the update
    ? - print help
    Discard changes [y,n,v,d,s,?]? y
  - Upgrading symfony/translation (v4.4.7 => v5.4.9): Checking out 1639abc117 from cache
    nesbot/carbon has modified files:
    M bin/carbon
    Discard changes [y,n,v,d,s,?]? y
  - Upgrading nesbot/carbon (2.32.2 => 2.59.1): Checking out a9000603ea from cache
  - Upgrading monolog/monolog (2.0.2 => 2.7.0): Checking out 5579edf28a from cache
  - Installing league/mime-type-detection (1.11.0): Cloning ff6248ea87 from cache
  - Upgrading league/flysystem (1.0.67 => 1.1.9): Checking out 094defdb4a from cache
  - Installing nette/utils (v3.2.7): Cloning 0af4e3de4d from cache
  - Installing nette/schema (v1.2.2): Cloning 9a39cef03a from cache
  - Installing dflydev/dot-access-data (v3.0.1): Cloning 0992cc1926 from cache
  - Installing league/config (v1.1.1): Cloning a9d39eeeb6 from cache
  - Upgrading league/commonmark (1.4.1 => 2.3.4): Checking out 155ec1c956 from cache
  - Installing laravel/serializable-closure (v1.2.0): Cloning 09f0e9fb61 from cache
  - Upgrading webmozart/assert (1.8.0 => 1.11.0): Checking out 11cb219949 from cache
  - Upgrading dragonmantank/cron-expression (v2.3.0 => v3.3.1): Checking out be85b3f05b from cache
  - Upgrading doctrine/inflector (1.3.1 => 1.4.4): Checking out 4bd5c1cdfc from cache
  - Upgrading laravel/framework (v6.18.10 => v8.83.22): Checking out 96aecced51 from cache
  - Installing arietimmerman/laravel-scim-server (dev-master 2c7ecc4): Cloning 2c7ecc450e from cache
  - Installing aws/aws-crt-php (v1.0.2): Cloning 3942776a8c from cache
  - Upgrading maximebf/debugbar (v1.16.2 => v1.18.0): Checking out 0d44b75f3b from cache
  - Upgrading barryvdh/laravel-debugbar (v3.3.2 => v3.7.0): Checking out 3372ed65e6 from cache
  - Installing sabberworm/php-css-parser (8.4.0): Cloning e41d214003 from cache
  - Installing phenx/php-svg-lib (0.4.1): Cloning 4498b5df7b from cache
  - Installing phenx/php-font-lib (0.5.4): Cloning dd448ad1ce from cache
  - Upgrading masterminds/html5 (2.7.0 => 2.7.5): Checking out f640ac1bdd from cache
  - Installing dompdf/dompdf (v2.0.0): Cloning 79573d8b8a from cache
  - Installing barryvdh/laravel-dompdf (v2.0.0): Cloning 1d47648c6c from cache
  - Installing dasprid/enum (1.0.3): Cloning 5abf82f213 from cache
  - Upgrading doctrine/annotations (1.10.2 => 1.13.3): Checking out 648b034334 from cache
  - Upgrading doctrine/reflection (1.2.1 => 1.2.3): Checking out 1034e5e71f from cache
  - Upgrading doctrine/event-manager (1.1.0 => 1.1.1): Checking out 41370af6a3 from cache
  - Upgrading doctrine/collections (1.6.4 => 1.6.8): Checking out 1958a74469 from cache
  - Upgrading doctrine/cache (1.10.0 => 1.13.0): Checking out 56cd022adb from cache
  - Upgrading doctrine/persistence (1.3.7 => 1.3.8): Checking out 7a6eac9fb6 from cache
  - Upgrading doctrine/common (2.12.0 => 2.13.3): Checking out f3812c026e from cache
  - Installing doctrine/deprecations (v1.0.0): Cloning 0e2a4f1f8c from cache
  - Upgrading doctrine/dbal (2.10.2 => 3.3.7): Checking out 9f79d46504 from cache
  - Upgrading squizlabs/php_codesniffer (3.5.5 => 3.7.1): Checking out 1359e176e9 from cache
  - Upgrading eduardokum/laravel-mail-auto-embed (1.0.5 => 1.0.7): Checking out ea09844459 from cache
  - Upgrading enshrined/svg-sanitize (0.13.3 => 0.15.4): Checking out e50b83a2f1 from cache
  - Installing facade/ignition-contracts (1.0.2): Cloning 3c921a1cdb from cache
  - Installing facade/flare-client-php (1.9.1): Cloning b2adf15127 from cache
  - Installing facade/ignition (2.17.6): Cloning 6acd82e986 from cache
  - Upgrading fideloper/proxy (4.3.0 => 4.4.2): Checking out a751f2bc86 from cache
  - Upgrading asm89/stack-cors (1.3.0 => v2.1.1): Checking out 73e5b88775 from cache
  - Installing fruitcake/laravel-cors (v2.2.0): Cloning 783a74f5e3 from cache
  - Upgrading intervention/image (2.5.1 => 2.7.2): Checking out 04be355f8d from cache
  - Upgrading laravel/helpers (v1.2.0 => v1.5.0): Checking out c28b0ccd79 from cache
  - Upgrading symfony/psr-http-message-bridge (v2.0.0 => v2.1.2): Checking out 22b37c8a3f from cache
  - Upgrading paragonie/random_compat (v9.99.99 => v9.99.100): Checking out 996434e549 from cache
  - Upgrading paragonie/constant_time_encoding (v2.3.0 => v2.6.3): Checking out 58c3f47f65 from cache
  - Upgrading phpseclib/phpseclib (2.0.27 => 3.0.14): Checking out 2f0b7af658 from cache
  - Upgrading nyholm/psr7 (1.2.1 => 1.5.1): Checking out f734364e38 from cache
  - Installing league/uri-interfaces (2.3.0): Cloning 00e7e2943f from cache
  - Installing league/uri (6.7.1): Cloning 2d7c87a086 from cache
  - Installing lcobucci/clock (2.0.0): Cloning 353d83fe2e from cache
  - Upgrading lcobucci/jwt (3.3.1 => 4.1.5): Checking out fe2d89f2ea from cache
    defuse/php-encryption has modified files:
    M .gitattributes
    M .gitignore
    M .php_cs
    M .travis.yml
    M LICENSE
    M README.md
    M composer.json
    M dist/Makefile
    M dist/box.json
    M dist/signingkey.asc
    39 more files modified, choose "v" to view the full list
    Discard changes [y,n,v,d,s,?]? y
  - Upgrading defuse/php-encryption (v2.2.1 => v2.3.1): Checking out 77880488b9 from cache
  - Upgrading league/oauth2-server (8.0.0 => 8.3.5): Checking out 7aeb7c42b4 from cache
  - Upgrading firebase/php-jwt (v5.2.0 => v6.3.0): Checking out 018dfc4e1d from cache
  - Upgrading laravel/passport (v8.4.4 => v10.4.1): Checking out b62b418a6d from cache
  - Upgrading laravel/slack-notification-channel (v2.0.2 => v2.4.0): Checking out 060617a315 from cache
  - Upgrading nikic/php-parser (v4.4.0 => v4.14.0): Checking out 34bea19b6e from cache
  - Upgrading psy/psysh (v0.10.3 => v0.11.7): Checking out 77fc727003 from cache
  - Upgrading laravel/tinker (v2.4.0 => v2.7.2): Checking out dff39b661e from cache
  - Installing laravel/ui (v3.4.6): Cloning 65ec5c03f7 from cache
  - Upgrading laravelcollective/html (v6.0.3 => v6.3.0): Checking out 78c3cb516a from cache
  - Upgrading league/csv (9.5.0 => 9.8.0): Checking out 9d2e0265c5 from cache
  - Upgrading mtdowling/jmespath.php (2.5.0 => 2.6.1): Checking out 9b87907a81 from cache
  - Upgrading aws/aws-sdk-php (3.135.1 => 3.231.12): Checking out 8f8742caa4 from cache
  - Upgrading league/flysystem-aws-s3-v3 (1.0.24 => 1.0.30): Checking out af286f291e from cache
  - Upgrading league/flysystem-cached-adapter (1.0.9 => 1.1.0): Checking out d1925efb22 from cache
  - Installing markbaker/matrix (3.0.0): Cloning c66aefcafb from cache
  - Installing markbaker/complex (3.0.1): Cloning ab8bc271e4 from cache
  - Installing myclabs/php-enum (1.8.3): Cloning b942d263c6 from cache
  - Installing maennchen/zipstream-php (2.2.1): Cloning 211e9ba153 from cache
  - Installing ezyang/htmlpurifier (v4.14.0): Cloning 12ab42bd6e from cache
  - Installing phpoffice/phpspreadsheet (1.24.1): Cloning 69991111e0 from cache
  - Installing maatwebsite/excel (3.1.40): Cloning 8a54972e3d from cache
  - Installing livewire/livewire (v2.10.6): Cloning 020ad095cf from cache
  - Installing mediconesystems/livewire-datatables (v0.5.4): Cloning bf6f24d529 from cache
  - Installing filp/whoops (2.14.5): Cloning a63e5e8f26 from cache
  - Installing nunomaduro/collision (v5.11.0): Cloning 8b610eef85 from cache
  - Upgrading robrichards/xmlseclibs (3.1.0 => 3.1.1): Checking out f8f19e58f2 from cache
  - Upgrading onelogin/php-saml (3.4.1 => 3.6.1): Checking out a7328b1188 from cache
  - Upgrading phpdocumentor/reflection-common (2.0.0 => 2.2.0): Checking out 1d01c49d4e from cache
  - Upgrading phpdocumentor/type-resolver (1.1.0 => 1.6.1): Checking out 77a3251873 from cache
  - Upgrading sebastian/recursion-context (3.0.0 => 4.0.4): Checking out cd9d8cf3c5 from cache
  - Upgrading sebastian/exporter (3.1.2 => 4.0.4): Checking out 65e8b7db47 from cache
  - Upgrading sebastian/diff (3.0.2 => 4.0.4): Checking out 3461e3fccc from cache
  - Upgrading sebastian/comparator (3.0.2 => 4.0.6): Checking out 55f4261989 from cache
  - Upgrading phpdocumentor/reflection-docblock (5.1.0 => 5.3.0): Checking out 622548b623 from cache
  - Upgrading doctrine/instantiator (1.3.0 => 1.4.1): Checking out 10dcfce151 from cache
  - Upgrading phpspec/prophecy (v1.10.3 => v1.15.0): Checking out bbcd7380b0 from cache
  - Upgrading pragmarx/google2fa (8.0.0 => v8.0.1): Checking out 80c3d801b3 from cache
  - Upgrading bacon/bacon-qr-code (1.0.3 => 2.0.7): Checking out d70c840f68 from cache
  - Upgrading pragmarx/google2fa-laravel (v1.3.3 => v1.4.1): Checking out f9014fd7ea from cache
  - Upgrading rollbar/rollbar (v2.0.0 => v2.1.0): Checking out ff3db5739d from cache
  - Upgrading rollbar/rollbar-laravel (v6.0.0 => v7.2.0): Checking out d7647ffabf from cache
  - Upgrading spatie/temporary-directory (1.2.2 => 1.3.0): Checking out f517729b37 from cache
  - Upgrading spatie/db-dumper (2.16.0 => 2.21.1): Checking out 05e5955fb8 from cache
  - Upgrading spatie/laravel-backup (6.9.0 => 6.16.5): Checking out 332fae80b1 from cache
  - Upgrading tecnickcom/tc-lib-color (1.12.15 => 1.14.14): Checking out f9e45c5949 from cache
  - Upgrading tecnickcom/tc-lib-barcode (1.15.20 => 1.17.14): Checking out 4907ef1e38 from cache
  - Upgrading unicodeveloper/laravel-password (1.0.3 => 1.0.4): Checking out 806e345ae9 from cache
  - Upgrading watson/validating (4.0.0 => 6.1.1): Checking out fda4daaf80 from cache
    0 [>---------------------------]    0 [->--------------------------]
Package doctrine/reflection is abandoned, you should avoid using it. Use roave/better-reflection instead.
Package swiftmailer/swiftmailer is abandoned, you should avoid using it. Use symfony/mailer instead.
Package phpunit/php-token-stream is abandoned, you should avoid using it. No replacement was suggested.
Generating optimized autoload files
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
> @php artisan package:discover --ansi
> @php artisan vendor:publish --force --tag=livewire:assets --ansi
84 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
> @php artisan package:discover --ansi
> @php artisan vendor:publish --force --tag=livewire:assets --ansi
Generating optimized autoload files
Discovered Package: arietimmerman/laravel-scim-server
Discovered Package: barryvdh/laravel-debugbar
Discovered Package: barryvdh/laravel-dompdf
Discovered Package: eduardokum/laravel-mail-auto-embed
Discovered Package: facade/ignition
Discovered Package: fideloper/proxy
Discovered Package: fruitcake/laravel-cors
Discovered Package: intervention/image
Discovered Package: laravel/passport
Discovered Package: laravel/slack-notification-channel
Discovered Package: laravel/tinker
Discovered Package: laravel/ui
Discovered Package: laravelcollective/html
Discovered Package: livewire/livewire
Discovered Package: maatwebsite/excel
Discovered Package: mediconesystems/livewire-datatables
Discovered Package: nesbot/carbon
Discovered Package: nunomaduro/collision
Discovered Package: pragmarx/google2fa-laravel
Discovered Package: spatie/laravel-backup
Discovered Package: unicodeveloper/laravel-password
Package manifest generated successfully.
Copied Directory [/vendor/livewire/livewire/dist] To [/public/vendor/livewire]
Publishing complete.
Generated optimized autoload files containing 8568 classes

Discovered Package: arietimmerman/laravel-scim-server
Discovered Package: barryvdh/laravel-debugbar
Discovered Package: barryvdh/laravel-dompdf
Discovered Package: eduardokum/laravel-mail-auto-embed
Discovered Package: facade/ignition
Discovered Package: fideloper/proxy
Discovered Package: fruitcake/laravel-cors
Discovered Package: intervention/image
Discovered Package: laravel/passport
Discovered Package: laravel/slack-notification-channel
Discovered Package: laravel/tinker
Discovered Package: laravel/ui
Discovered Package: laravelcollective/html
Discovered Package: livewire/livewire
Discovered Package: maatwebsite/excel
Discovered Package: mediconesystems/livewire-datatables
Discovered Package: nesbot/carbon
Discovered Package: nunomaduro/collision
Discovered Package: pragmarx/google2fa-laravel
Discovered Package: spatie/laravel-backup
Discovered Package: unicodeveloper/laravel-password
Package manifest generated successfully.
Copied Directory [/vendor/livewire/livewire/dist] To [/public/vendor/livewire]
Publishing complete.
--------------------------------------------------------
STEP 9: Migrating database:
--------------------------------------------------------

Nothing to migrate.

--------------------------------------------------------
STEP 10: Checking for OAuth keys:
--------------------------------------------------------

√ OAuth keys detected. Skipping passport install.

--------------------------------------------------------
STEP 11: Taking application out of maintenance mode:
--------------------------------------------------------

-- Application is already up.

---------------------- FINISHED! -----------------------
All done! Clear your browser cookies and re-login to use
your upgraded Snipe-IT!
--------------------------------------------------------
snipe commented 1 year ago

In ProviderRepository.php line 208: Class 'Barryvdh\DomPDF\ServiceProvider' not found

That bit still concerns me and might end up making things act funny. We usually only see that when composer is not up to latest. https://getcomposer.org/doc/03-cli.md#self-update-selfupdate

Command-line interface / Commands - Composer
A Dependency Manager for PHP
kwoodVisions commented 1 year ago

I ran composer self-update and it said I'm on the latest version. I think it was an issue where I had installed composer as root perhaps so maybe I just need to follow your instructions "So you installed composer as root" and get that fixed up and then try it again.

kwoodVisions commented 1 year ago

OK, fixed the owner of composer and re-ran "php upgrade.php" and I'm not seeing those errors now. Here's the output:

--------------------------------------------------------
WELCOME TO THE SNIPE-IT UPGRADER!
--------------------------------------------------------

This script will attempt to:

- validate some very basic .env file settings
- check your PHP version and extension requirements
- check directory permissions
- do a git pull to bring you to the latest version
- run composer install to get your vendors up to date
- run migrations to get your schema up to date
- clear out old cache settings

--------------------------------------------------------
STEP 1: Checking .env file:
- Your .env is located at /var/www/snipeit/.env
--------------------------------------------------------

√ Your APP_KEY is not blank.
√ Your APP_URL is not null or blank. It is set to https://snipeit
√ Your APP_URL is set to https://snipeit and starts with the protocol (https:// or http://)
√ Your APP_URL (https://snipeit) does not have a trailing slash.

--------------------------------------------------------
STEP 2: Checking PHP requirements:
--------------------------------------------------------

Current PHP version: (7.4.33) is at least 7.4.0 - continuing...
FYI: The php.ini used by this PHP is: /etc/php/7.4/cli/php.ini

Checking Required PHP extensions...

√ bcmath is installed!
√ curl is installed!
√ fileinfo is installed!
√ gd is installed!
√ json is installed!
√ ldap is installed!
√ mbstring is installed!
√ mysqli is installed!
√ openssl is installed!
√ PDO is installed!
√ sodium is installed!
√ tokenizer is installed!
√ xml is installed!
√ zip is installed!

--------------------------------------------------------
STEP 3: Checking directory permissions:
--------------------------------------------------------

√ /var/www/snipeit/bootstrap/cache is writable
√ /var/www/snipeit/storage is writable
√ /var/www/snipeit/storage/logs is writable
√ /var/www/snipeit/storage/logs/laravel.log is writable
√ /var/www/snipeit/storage/framework is writable
√ /var/www/snipeit/storage/framework/cache is writable
√ /var/www/snipeit/storage/framework/sessions is writable
√ /var/www/snipeit/storage/framework/views is writable
√ /var/www/snipeit/storage/app is writable
√ /var/www/snipeit/storage/app/backups is writable
√ /var/www/snipeit/storage/app/backup-temp is writable
√ /var/www/snipeit/storage/private_uploads is writable
√ /var/www/snipeit/public/uploads is writable

--------------------------------------------------------
STEP 4: Backing up database:
--------------------------------------------------------

-- Starting backup...
Dumping database snipeit...
Determining files to backup...
Zipping 513 files and directories...
Created zip containing 513 files and directories. Size is 11.79 MB
Copying zip to disk named backup...
Successfully copied zip to disk named backup.
Backup completed!

--------------------------------------------------------
STEP 5: Putting application into maintenance mode:
--------------------------------------------------------

-- Application is now in maintenance mode.

--------------------------------------------------------
STEP 6: Pulling latest from Git (master branch):
--------------------------------------------------------

Git is installed.
Already on 'master'
-- No local changes to save
-- Your branch is up to date with 'origin/master'.
-- Already up to date.

--------------------------------------------------------
STEP 7: Cleaning up old cached files:
--------------------------------------------------------

√ No bootstrap/cache/compiled.php, so nothing to delete.
√ Deleting bootstrap/cache/services.php. It is no longer used.
√ No bootstrap/cache/config.php, so nothing to delete.
√ No vendor/symfony/translation/TranslatorInterface.php, so nothing to delete.

-- Configuration cache cleared!
-- Failed to clear cache. Make sure you have the appropriate permissions.
-- Route cache cleared!
-- Compiled views cleared!

--------------------------------------------------------
STEP 8: Updating composer dependencies:
(This may take a moment.)
--------------------------------------------------------

-- Running the app in production mode.
-- We couldn't find a local composer.phar. No worries, trying globally.
Since you are running composer globally, we won't try to update it for you.
If you run into issues with this step, try running `composer self-update`
before running this updater again

Installing dependencies from lock file
Verifying lock file contents can be installed on current platform.
Package operations: 0 installs, 0 updates, 29 removals
  - Removing theseer/tokenizer (1.2.1)
  - Removing symfony/dom-crawler (v4.4.42)
  - Removing sebastian/version (3.0.2)
  - Removing sebastian/type (3.0.0)
  - Removing sebastian/resource-operations (3.0.3)
  - Removing sebastian/object-reflector (2.0.4)
  - Removing sebastian/object-enumerator (4.0.4)
  - Removing sebastian/lines-of-code (1.0.3)
  - Removing sebastian/global-state (5.0.5)
  - Removing sebastian/environment (5.1.4)
  - Removing sebastian/complexity (2.0.2)
  - Removing sebastian/code-unit-reverse-lookup (2.0.3)
  - Removing sebastian/code-unit (1.0.8)
  - Removing sebastian/cli-parser (1.0.1)
  - Removing phpunit/phpunit (9.5.21)
  - Removing phpunit/php-token-stream (3.1.3)
  - Removing phpunit/php-timer (5.0.3)
  - Removing phpunit/php-text-template (2.0.4)
  - Removing phpunit/php-invoker (3.1.1)
  - Removing phpunit/php-file-iterator (3.0.6)
  - Removing phpunit/php-code-coverage (9.2.15)
  - Removing php-webdriver/webdriver (1.12.1)
  - Removing phar-io/version (3.2.1)
  - Removing phar-io/manifest (2.0.3)
  - Removing myclabs/deep-copy (1.11.0)
  - Removing mockery/mockery (1.5.0)
  - Removing laravel/dusk (v6.25.0)
  - Removing hamcrest/hamcrest-php (v2.0.1)
  - Removing fakerphp/faker (v1.20.0)
  0/19 [>---------------------------]   0%
 10/19 [==============>-------------]  52%
 19/19 [============================] 100%
Package doctrine/reflection is abandoned, you should avoid using it. Use roave/better-reflection instead.
Package swiftmailer/swiftmailer is abandoned, you should avoid using it. Use symfony/mailer instead.
Package phpunit/php-token-stream is abandoned, you should avoid using it. No replacement was suggested.
Generating optimized autoload files
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
> @php artisan package:discover --ansi
> @php artisan vendor:publish --force --tag=livewire:assets --ansi
84 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
Class ParsedownTest located in ./vendor/erusev/parsedown/test/ParsedownTest.php does not comply with psr-0 autoloading standard. Skipping.
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
> @php artisan package:discover --ansi
> @php artisan vendor:publish --force --tag=livewire:assets --ansi
Generating optimized autoload files
Discovered Package: arietimmerman/laravel-scim-server
Discovered Package: barryvdh/laravel-debugbar
Discovered Package: barryvdh/laravel-dompdf
Discovered Package: eduardokum/laravel-mail-auto-embed
Discovered Package: facade/ignition
Discovered Package: fideloper/proxy
Discovered Package: fruitcake/laravel-cors
Discovered Package: intervention/image
Discovered Package: laravel/passport
Discovered Package: laravel/slack-notification-channel
Discovered Package: laravel/tinker
Discovered Package: laravel/ui
Discovered Package: laravelcollective/html
Discovered Package: livewire/livewire
Discovered Package: maatwebsite/excel
Discovered Package: mediconesystems/livewire-datatables
Discovered Package: nesbot/carbon
Discovered Package: nunomaduro/collision
Discovered Package: pragmarx/google2fa-laravel
Discovered Package: spatie/laravel-backup
Discovered Package: unicodeveloper/laravel-password
Package manifest generated successfully.
Copied Directory [/vendor/livewire/livewire/dist] To [/public/vendor/livewire]
Publishing complete.
Generated optimized autoload files containing 8568 classes

Discovered Package: arietimmerman/laravel-scim-server
Discovered Package: barryvdh/laravel-debugbar
Discovered Package: barryvdh/laravel-dompdf
Discovered Package: eduardokum/laravel-mail-auto-embed
Discovered Package: facade/ignition
Discovered Package: fideloper/proxy
Discovered Package: fruitcake/laravel-cors
Discovered Package: intervention/image
Discovered Package: laravel/passport
Discovered Package: laravel/slack-notification-channel
Discovered Package: laravel/tinker
Discovered Package: laravel/ui
Discovered Package: laravelcollective/html
Discovered Package: livewire/livewire
Discovered Package: maatwebsite/excel
Discovered Package: mediconesystems/livewire-datatables
Discovered Package: nesbot/carbon
Discovered Package: nunomaduro/collision
Discovered Package: pragmarx/google2fa-laravel
Discovered Package: spatie/laravel-backup
Discovered Package: unicodeveloper/laravel-password
Package manifest generated successfully.
Copied Directory [/vendor/livewire/livewire/dist] To [/public/vendor/livewire]
Publishing complete.
--------------------------------------------------------
STEP 9: Migrating database:
--------------------------------------------------------

Nothing to migrate.

--------------------------------------------------------
STEP 10: Checking for OAuth keys:
--------------------------------------------------------

√ OAuth keys detected. Skipping passport install.

--------------------------------------------------------
STEP 11: Taking application out of maintenance mode:
--------------------------------------------------------

-- Application is now live.

---------------------- FINISHED! -----------------------
All done! Clear your browser cookies and re-login to use
your upgraded Snipe-IT!
--------------------------------------------------------
snipe commented 1 year ago

Looks great! Is everything working for you now?

kwoodVisions commented 1 year ago

Looks great! Is everything working for you now?

Yes, everything else is working great. Thank you for all your help!