Skip to content

Commit 8071724

Browse files
danny6167danny6167
authored
Merge branch '1.0-develop' into docker/php8.3
2 parents 4882095 + 30af8e6 commit 8071724

File tree

461 files changed

+6412
-4913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

461 files changed

+6412
-4913
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,22 @@ on:
1313
jobs:
1414
ui:
1515
name: UI
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-24.04
17+
permissions:
18+
contents: read
1719
strategy:
1820
fail-fast: false
1921
matrix:
2022
node-version: [16]
2123
steps:
2224
- name: Code Checkout
23-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2426

2527
- name: Setup Node
26-
uses: actions/setup-node@v3
28+
uses: actions/setup-node@v4
2729
with:
2830
node-version: ${{ matrix.node-version }}
29-
cache: "yarn"
31+
cache: yarn
3032

3133
- name: Install dependencies
3234
run: yarn install --frozen-lockfile

‎.github/workflows/ci.yaml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,19 @@ on:
1313
jobs:
1414
tests:
1515
name: Tests
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-24.04
17+
permissions:
18+
contents: read
1719
strategy:
1820
fail-fast: false
1921
matrix:
20-
php: [8.1, 8.2]
21-
database: ["mariadb:10.2", "mysql:8"]
22+
php: [8.2, 8.3]
23+
database:
24+
- mariadb:10.5
25+
- mariadb:10.11
26+
- mariadb:11.5
27+
- mysql:8
28+
- mysql:9
2229
services:
2330
database:
2431
image: ${{ matrix.database }}
@@ -27,18 +34,17 @@ jobs:
2734
MYSQL_DATABASE: testing
2835
ports:
2936
- 3306
30-
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3137
steps:
3238
- name: Code Checkout
33-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
3440

3541
- name: Get cache directory
3642
id: composer-cache
3743
run: |
3844
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
3945
4046
- name: Cache
41-
uses: actions/cache@v3
47+
uses: actions/cache@v4
4248
with:
4349
path: ${{ steps.composer-cache.outputs.dir }}
4450
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}

‎.github/workflows/docker.yaml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,18 @@ on:
1616
jobs:
1717
push:
1818
name: Push
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-24.04
2020
if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
21+
permissions:
22+
contents: read
23+
packages: write
2124
steps:
2225
- name: Code checkout
23-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2427

2528
- name: Docker metadata
2629
id: docker_meta
27-
uses: docker/metadata-action@v4
30+
uses: docker/metadata-action@v5
2831
with:
2932
images: ghcr.io/pterodactyl/panel
3033
flavor: |
@@ -35,18 +38,18 @@ jobs:
3538
type=ref,event=branch
3639
3740
- name: Setup QEMU
38-
uses: docker/setup-qemu-action@v2
41+
uses: docker/setup-qemu-action@v3
3942

4043
- name: Setup Docker buildx
41-
uses: docker/setup-buildx-action@v2
44+
uses: docker/setup-buildx-action@v3
4245

4346
- name: Login to GitHub Container Registry
44-
uses: docker/login-action@v2
47+
uses: docker/login-action@v3
4548
if: "github.event_name != 'pull_request'"
4649
with:
4750
registry: ghcr.io
4851
username: ${{ github.repository_owner }}
49-
password: ${{ secrets.REGISTRY_TOKEN }}
52+
password: ${{ secrets.GITHUB_TOKEN }}
5053

5154
- name: Update version
5255
if: "github.event_name == 'release' && github.event.action == 'published'"
@@ -56,7 +59,7 @@ jobs:
5659
sed -i "s/ 'version' => 'canary',/ 'version' => '${REF:1}',/" config/app.php
5760
5861
- name: Build and Push
59-
uses: docker/build-push-action@v4
62+
uses: docker/build-push-action@v6
6063
with:
6164
context: .
6265
file: ./Dockerfile

‎.github/workflows/lint.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ on:
1313
jobs:
1414
lint:
1515
name: Lint
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-24.04
17+
permissions:
18+
contents: read
1719
steps:
1820
- name: Code Checkout
19-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2022

2123
- name: Setup PHP
2224
uses: shivammathur/setup-php@v2
2325
with:
24-
php-version: "8.1"
26+
php-version: "8.2"
2527
extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
2628
tools: composer:v2
2729
coverage: none

‎.github/workflows/release.yaml‎

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,18 @@ on:
88
jobs:
99
release:
1010
name: Release
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
12+
permissions:
13+
contents: write # write is required to create releases and push.
1214
steps:
1315
- name: Code checkout
14-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1517

1618
- name: Setup Node
17-
uses: actions/setup-node@v3
19+
uses: actions/setup-node@v4
1820
with:
1921
node-version: 16
20-
cache: "yarn"
22+
cache: yarn
2123

2224
- name: Install dependencies
2325
run: yarn install --frozen-lockfile
@@ -29,19 +31,19 @@ jobs:
2931
env:
3032
REF: ${{ github.ref }}
3133
run: |
32-
BRANCH=release/${REF:10}
33-
git config --local user.email "ci@pterodactyl.io"
34-
git config --local user.name "Pterodactyl CI"
35-
git checkout -b $BRANCH
36-
git push -u origin $BRANCH
34+
BRANCH=release/"${REF:10}"
35+
git config --local user.email 'ci@pterodactyl.io'
36+
git config --local user.name 'Pterodactyl CI'
37+
git checkout -b "$BRANCH"
38+
git push -u origin "$BRANCH"
3739
sed -i "s/ 'version' => 'canary',/ 'version' => '${REF:11}',/" config/app.php
3840
git add config/app.php
39-
git commit -m "ci(release): bump version"
41+
git commit -m 'ci(release): bump version'
4042
git push
4143
4244
- name: Create release archive
4345
run: |
44-
rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpunit.xml shell.nix
46+
rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpunit.xml shell.nix
4547
tar -czf panel.tar.gz * .editorconfig .env.example .eslintignore .eslintrc.js .gitignore .prettierrc.json
4648
4749
- name: Extract changelog
@@ -54,36 +56,17 @@ jobs:
5456
run: |
5557
SUM=`sha256sum panel.tar.gz`
5658
echo -e "\n#### SHA256 Checksum\n\n\`\`\`\n$SUM\n\`\`\`\n" >> ./RELEASE_CHANGELOG
57-
echo $SUM > checksum.txt
59+
echo "$SUM" > checksum.txt
5860
5961
- name: Create release
6062
id: create_release
61-
uses: softprops/action-gh-release@v1
63+
uses: softprops/action-gh-release@v2
6264
env:
6365
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6466
with:
6567
draft: true
6668
prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
6769
body_path: ./RELEASE_CHANGELOG
68-
69-
- name: Upload release archive
70-
id: upload-release-archive
71-
uses: actions/upload-release-asset@v1
72-
env:
73-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
74-
with:
75-
upload_url: ${{ steps.create_release.outputs.upload_url }}
76-
asset_path: panel.tar.gz
77-
asset_name: panel.tar.gz
78-
asset_content_type: application/gzip
79-
80-
- name: Upload release checksum
81-
id: upload-release-checksum
82-
uses: actions/upload-release-asset@v1
83-
env:
84-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
85-
with:
86-
upload_url: ${{ steps.create_release.outputs.upload_url }}
87-
asset_path: ./checksum.txt
88-
asset_name: checksum.txt
89-
asset_content_type: text/plain
70+
files: |
71+
panel.tar.gz
72+
checksum.txt

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ public/assets/manifest.json
2121
# For local development with docker
2222
# Remove if we ever put the Dockerfile in the repo
2323
.dockerignore
24-
docker-compose.yml
24+
docker-compose.*
25+
!docker-compose.example.yml
26+
!docker-compose.example.yaml
2527

2628
# for image related files
2729
misc
@@ -33,4 +35,3 @@ resources/lang/locales.js
3335
/public/build
3436
/public/hot
3537
result
36-
docker-compose.yaml

‎.php-cs-fixer.dist.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
use PhpCsFixer\Config;
44
use PhpCsFixer\Finder;
5+
use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
56

67
$finder = (new Finder())
78
->in(__DIR__)
@@ -14,6 +15,7 @@
1415
->notName(['_ide_helper*']);
1516

1617
return (new Config())
18+
->setParallelConfig(ParallelConfigFactory::detect())
1719
->setRiskyAllowed(true)
1820
->setFinder($finder)
1921
->setRules([

‎CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,28 @@ This file is a running track of new features and fixes to each version of the pa
33

44
This project follows [Semantic Versioning](http://semver.org) guidelines.
55

6+
## v1.11.10
7+
8+
### BREAKING
9+
10+
* Minimum PHP verion is now 8.2 due to Laravel upgrade!
11+
12+
### Fixed
13+
14+
* Update Laravel to address [CVE-2024-52301](https://github.com/advisories/GHSA-gv7v-rgg6-548h)
15+
16+
## v1.11.9
17+
18+
### Fixed
19+
20+
* Fixed issue with CI not pushing Docker image
21+
22+
## v1.11.8
23+
24+
### Fixed
25+
26+
* Fixed an issue where a `DELETE` request was used instead of a `POST`, potentially logging user passwords in plain text if they disable 2FA.
27+
628
## v1.11.7
729

830
### Added

‎README.md‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ Stop settling for less. Make game servers a first class citizen on your platform
2727
I would like to extend my sincere thanks to the following sponsors for helping fund Pterodactyl's development.
2828
[Interested in becoming a sponsor?](https://github.com/sponsors/matthewpi)
2929

30-
| Company | About |
31-
|--------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
32-
| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand. |
33-
| [**CodeNode LLC**](https://codenode.gg/) | Looking for simplicity? Well, look no further! CodeNode has got you covered with everything you need at the rock-bottom price of $1.75 per GB, including dedicated IPs in Dallas, Texas, and Amsterdam, Netherlands. We're not just good, we're the best in the game! |
34-
| [**BisectHosting**](https://www.bisecthosting.com/) | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012. |
35-
| [**MineStrator**](https://minestrator.com/) | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try! |
36-
| [**HostEZ**](https://hostez.io) | US & EU Rust & Minecraft Hosting. DDoS Protected bare metal, VPS and colocation with low latency, high uptime and maximum availability. EZ! |
37-
| [**Blueprint**](https://blueprint.zip/?pterodactyl=true) | Create and install Pterodactyl addons and themes with the growing Blueprint framework - the package-manager for Pterodactyl. Use multiple modifications at once without worrying about conflicts and make use of the large extension ecosystem. |
38-
| [**indifferent broccoli**](https://indifferentbroccoli.com/) | indifferent broccoli is a game server hosting and rental company. With us, you get top-notch computer power for your gaming sessions. We destroy lag, latency, and complexity--letting you focus on the fun stuff. |
30+
| Company | About |
31+
|-----------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
32+
| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand. |
33+
| [**BisectHosting**](https://www.bisecthosting.com/) | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012. |
34+
| [**MineStrator**](https://minestrator.com/) | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try! |
35+
| [**HostEZ**](https://hostez.io) | US & EU Rust & Minecraft Hosting. DDoS Protected bare metal, VPS and colocation with low latency, high uptime and maximum availability. EZ! |
36+
| [**Blueprint**](https://blueprint.zip/?utm_source=pterodactyl&utm_medium=sponsor) | Create and install Pterodactyl addons and themes with the growing Blueprint framework - the package-manager for Pterodactyl. Use multiple modifications at once without worrying about conflicts and make use of the large extension ecosystem. |
37+
| [**indifferent broccoli**](https://indifferentbroccoli.com/) | indifferent broccoli is a game server hosting and rental company. With us, you get top-notch computer power for your gaming sessions. We destroy lag, latency, and complexity--letting you focus on the fun stuff. |
3938

4039
### Supported Games
4140

@@ -64,7 +63,7 @@ and there are plenty more games available provided by the community. Some of the
6463
* Xonotic
6564
* Starmade
6665
* Discord ATLBot, and most other Node.js/Python discord bots
67-
* [and many more...](https://github.com/parkervcp/eggs)
66+
* [and many more...](https://pterodactyleggs.com)
6867

6968
## License
7069

‎app/Console/Commands/Location/DeleteLocationCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class DeleteLocationCommand extends Command
2020
*/
2121
public function __construct(
2222
private LocationDeletionService $deletionService,
23-
private LocationRepositoryInterface $repository
23+
private LocationRepositoryInterface $repository,
2424
) {
2525
parent::__construct();
2626
}

0 commit comments

Comments
 (0)