Skip to content

Commit

Permalink
Merge pull request #4050 from HDInnovations/8.x.x
Browse files Browse the repository at this point in the history
(Release) v8.2.0
  • Loading branch information
HDVinnie authored Aug 15, 2024
2 parents 68ef67e + a295c81 commit 5125cd3
Show file tree
Hide file tree
Showing 3,136 changed files with 28,226 additions and 15,646 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 5 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
root = true

[*.blade.php]
[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
spelling_language = en-US
trim_trailing_whitespace = true
insert_final_newline = true

[*.vue]
indent_size = 2
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ DB_PORT=3306
DB_DATABASE=unit3d
DB_USERNAME=root
DB_PASSWORD=
#PRISTINE_DB_FILE=/home/vagrant/code/database/unit3d_test.sql

BROADCAST_CONNECTION=redis
CACHE_STORE=redis
Expand Down
5 changes: 4 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ body:
id: logs
attributes:
label: Stack trace & logs
description: If you have a stack trace, you can copy it here. You may hide sensible information.
description: |
If you have a stack trace, you can copy it here. You may hide sensitive information.
Every error 500 will produce a stack trace found in Staff Dashboard > Laravel Log.
Including a stack trace when reporting an error 500 is required.
placeholder: This is automatically formatted into code, no need for backticks.
render: shell
validations:
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/larastan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup PHP 8.2
- name: Setup PHP 8.3
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
Expand All @@ -50,4 +50,11 @@ jobs:
- name: Clear Application Cache
run: php artisan optimize:clear
- name: Run Larastan
run: ./vendor/bin/phpstan analyse
run: ./vendor/bin/phpstan analyse -vvv --memory-limit=2G
- name: Cache phpstan cache directory
uses: actions/cache@v4
with:
path: .phpstan.cache
key: "phpstan-cache-${{ github.run_id }}"
restore-keys: |
phpstan-cache-
7 changes: 7 additions & 0 deletions .github/workflows/phpunit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,10 @@ jobs:
DB_USERNAME: root
DB_DATABASE: unit3d
DB_PASSWORD: null
- name: Cache phpunit cache directory
uses: actions/cache@v4
with:
path: .phpunit.cache
key: "phpunit-cache-${{ github.run_id }}"
restore-keys: |
phpunit-cache-
2 changes: 1 addition & 1 deletion .github/workflows/prettier-blade.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Format Blade Files
name: Format Blade Files (Prettier)
on: [push, pull_request]
jobs:
format-blade-files:
Expand Down
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@

# Laravel
# Ignore everything in the public/files directory EXCEPT the .gitkeep
/public/vendor/livewire/livewire.js
/public/vendor/livewire/manifest.json
/public/files
!.gitkeep
/public/sounds
/public/storage
/public/vendor
/storage/backups
/storage/debugbar
/storage/gitupdate
/storage/*.key
.env
Expand Down Expand Up @@ -41,3 +45,10 @@ npm-debug.log
_ide_helper.php
supervisor.ini
/.phpunit.cache/
/.phpstan.cache/
/caddy
frankenphp
frankenphp-worker.php
/data
config/caddy/autosave.json
/data/
8 changes: 8 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
/resources/views/**/*.*
!/resources/views/**/*.blade.php

# except resources/js, but ignore resources/js/vendor
!/resources/js/
/resources/js/vendor

# except resources/scss, but ignores resoruces/scss/vendor
!/resources/sass/
/resources/sass/vendor

# ignored
resources/views/emails
resources/views/rss/show.blade.php
Expand Down
29 changes: 29 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,35 @@
"semi": true,
"singleQuote": true
}
},
{
"files": [
"*.js"
],
"options": {
"printWidth": 100,
"semi": true,
"singleQuote": true
}
},
{
"files": [
"*.vue"
],
"options": {
"printWidth": 100,
"semi": true,
"singleQuote": true
}
},
{
"files": [
"*.scss"
],
"options": {
"semi": true,
"singleQuote": true
}
}
]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h1 align="center">UNIT3D Community Edition</h1>

<p align="center">
<a href="http://laravel.com"><img src="https://img.shields.io/badge/Laravel-10-f4645f.svg" /></a>
<a href="http://laravel.com"><img src="https://img.shields.io/badge/Laravel-11-f4645f.svg" /></a>
<a href="https://github.com/HDInnovations/UNIT3D/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-AGPL%20v3.0-yellow.svg" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/lint.yml/badge.svg?branch=master"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/lint.yml/badge.svg?branch=master" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/phpunit-test.yml/badge.svg?branch=master"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/phpunit-test.yml/badge.svg?branch=master" /></a>
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserFilled100Requests.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserFilled25Requests.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserFilled50Requests.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserFilled75Requests.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade100Comments.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade100Posts.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade100Uploads.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade200Comments.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade200Posts.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade200Uploads.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade25Posts.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade25Uploads.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade300Comments.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade300Posts.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade300Uploads.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade400Comments.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade400Posts.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade400Uploads.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade500Comments.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade500Posts.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade500Uploads.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade50Comments.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade50Posts.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade50Uploads.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade600Comments.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade600Posts.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade600Uploads.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade700Comments.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
3 changes: 3 additions & 0 deletions app/Achievements/UserMade700Posts.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* NOTICE OF LICENSE.
*
Expand Down
Loading

0 comments on commit 5125cd3

Please sign in to comment.