Skip to content

Commit e4bc76e

Browse files
committed
Merge branch 'main' into srwiez/build-with-obfuscated-bundle
# Conflicts: # config/nativephp.php # src/NativeServiceProvider.php # tests/Command/IgnoreFilesAndFoldersTest.php
2 parents 2027cd2 + 0102a92 commit e4bc76e

24 files changed

+262
-377
lines changed

.github/workflows/dependabot-auto-merge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v2.2.0
16+
uses: dependabot/fetch-metadata@v2.3.0
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919

.github/workflows/fix-php-code-style-issues.yml

+18-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
name: Fix PHP code style issues
1+
# Check and fix PHP code style issues
2+
# Pull request: automatically fix PHP code style issues
3+
# Main branch: only check PHP code style issues since we don't have write permission
4+
name: Check and fix PHP code style issues
25

36
on:
47
push:
58
paths:
69
- '**.php'
10+
pull_request:
11+
paths:
12+
- '**.php'
713

814
permissions:
915
contents: write
@@ -18,10 +24,20 @@ jobs:
1824
with:
1925
ref: ${{ github.head_ref }}
2026

27+
- name: Check PHP code style issues
28+
if: github.event_name == 'push'
29+
uses: aglipanci/[email protected]
30+
with:
31+
verboseMode: true
32+
testMode: true
33+
2134
- name: Fix PHP code style issues
22-
uses: aglipanci/[email protected]
35+
if: github.event_name == 'pull_request'
36+
uses: aglipanci/[email protected]
2337

2438
- name: Commit changes
39+
if: github.event_name == 'pull_request'
2540
uses: stefanzweifel/git-auto-commit-action@v5
2641
with:
2742
commit_message: Fix styling
43+

.github/workflows/run-tests.yml

+10-17
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,18 @@ jobs:
1010
test:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
13-
fail-fast: true
13+
fail-fast: false
1414
matrix:
1515
os: [ubuntu-latest, windows-latest]
16-
php: [8.3, 8.2, 8.1]
17-
laravel: [11.*, 10.*]
16+
php: [8.4, 8.3, 8.2, 8.1]
17+
laravel: [12.*, 11.*, 10.*]
1818
stability: [prefer-lowest, prefer-stable]
19-
include:
20-
- laravel: 11.*
21-
testbench: 9.*
22-
carbon: ^3.2
23-
laravel-package-tools: ^1.16.4
24-
collision: ^8.1.1
25-
26-
- laravel: 10.*
27-
testbench: 8.*
28-
carbon: ^2.63
29-
laravel-package-tools: ^1.16.4
30-
collision: 7.*
3119

3220
exclude:
3321
- laravel: 11.*
3422
php: 8.1
23+
- laravel: 12.*
24+
php: 8.1
3525

3626
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
3727

@@ -53,11 +43,14 @@ jobs:
5343
5444
- name: Install dependencies
5545
run: |
56-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" "spatie/laravel-package-tools:${{ matrix.laravel-package-tools }}" "nunomaduro/collision:${{ matrix.collision }}" --no-interaction --no-update
46+
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
5747
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
5848
5949
- name: List Installed Dependencies
60-
run: composer show -D
50+
run: composer show
51+
52+
# - name: Debug PhpUnit version
53+
# run: composer why phpunit/phpunit -t
6154

6255
- name: Execute tests
6356
run: vendor/bin/pest

CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22

33
All notable changes to `nativephp-laravel` will be documented in this file.
44

5+
## 1.0.0-beta.1 - 2025-01-21
6+
7+
### What's Changed
8+
9+
* Child process queue workers by @XbNz in https://github.com/NativePHP/laravel/pull/450
10+
* fix: static analysis by @SRWieZ in https://github.com/NativePHP/laravel/pull/452
11+
* feat: default notification title by @SRWieZ in https://github.com/NativePHP/laravel/pull/451
12+
* Fix menubar not ready by @SRWieZ in https://github.com/NativePHP/laravel/pull/453
13+
* Add support for Window::show() by @curtisblackwell in https://github.com/NativePHP/laravel/pull/454
14+
* Fix: Return type mismatch between screen facade and screen class methods. by @kondi3 in https://github.com/NativePHP/laravel/pull/463
15+
16+
### New Contributors
17+
18+
* @kondi3 made their first contribution in https://github.com/NativePHP/laravel/pull/463
19+
20+
**Full Changelog**: https://github.com/NativePHP/laravel/compare/0.7.0...0.8.0
21+
522
## 0.7.0 - 2024-12-19
623

724
### What's Changed

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Thanks to the following sponsors for funding NativePHP development. Please consi
2727
- [RedGalaxy](https://www.redgalaxy.co.uk) - A web application development studio based in Cambridgeshire, building solutions to help businesses improve efficiency and profitability.
2828
- [Sevalla](https://sevalla.com/?utm_source=nativephp&utm_medium=Referral&utm_campaign=homepage) - Host and manage your applications, databases, and static sites in a single, intuitive platform.
2929
- [KaasHosting](https://www.kaashosting.nl/?lang=en) - Minecraft Server and VPS hosting from The Netherlands.
30+
- [Borah Digital Labs](https://borah.digital/) - An MVP building studio from the sunny Canary Islands focusing on AI, SaaS and online platforms.
3031

3132
## Changelog
3233

@@ -43,6 +44,7 @@ Please review [our security policy](../../security/policy) on how to report secu
4344
## Credits
4445

4546
- [Marcel Pociot](https://github.com/mpociot)
47+
- [Simon Hamp](https://github.com/simonhamp)
4648
- [All Contributors](../../contributors)
4749

4850
## License

composer.json

+23-11
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@
3232
],
3333
"require": {
3434
"php": "^8.1",
35-
"illuminate/contracts": "^10.0|^11.0",
35+
"illuminate/contracts": "^10.0|^11.0|^12.0",
3636
"spatie/laravel-package-tools": "^1.16.4",
3737
"symfony/finder": "^6.2|^7.0",
3838
"ext-zip": "*"
3939
},
4040
"require-dev": {
4141
"guzzlehttp/guzzle": "^7.0",
42-
"larastan/larastan": "^2.0|^3.0",
4342
"laravel/pint": "^1.0",
44-
"nunomaduro/collision": "^7.9",
45-
"orchestra/testbench": "^8.0",
46-
"pestphp/pest": "^2.0",
47-
"pestphp/pest-plugin-arch": "^2.0",
48-
"pestphp/pest-plugin-laravel": "^2.0",
43+
"larastan/larastan": "^2.0|^3.1",
44+
"nunomaduro/collision": "^7.11|^8.1.1",
45+
"orchestra/testbench": "^8.0|^9.0|^10.0",
46+
"pestphp/pest": "^v2.30|^3.0",
47+
"pestphp/pest-plugin-arch": "^2.0|^3.0",
48+
"pestphp/pest-plugin-laravel": "^2.0|^3.1",
4949
"phpstan/extension-installer": "^1.1",
50-
"phpstan/phpstan-deprecation-rules": "^1.0",
51-
"phpstan/phpstan-phpunit": "^1.0",
50+
"phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
51+
"phpstan/phpstan-phpunit": "^1.0|^2.0",
5252
"spatie/laravel-ray": "^1.26"
5353
},
5454
"autoload": {
@@ -86,11 +86,23 @@
8686
"Native\\Laravel\\NativeServiceProvider"
8787
],
8888
"aliases": {
89+
"App": "Native\\Laravel\\Facades\\App",
90+
"ChildProcess": "Native\\Laravel\\Facades\\ChildProcess",
91+
"Clipboard": "Native\\Laravel\\Facades\\Clipboard",
8992
"ContextMenu": "Native\\Laravel\\Facades\\ContextMenu",
9093
"Dock": "Native\\Laravel\\Facades\\Dock",
94+
"GlobalShortcut": "Native\\Laravel\\Facades\\GlobalShortcut",
95+
"Menu": "Native\\Laravel\\Facades\\Menu",
96+
"MenuBar": "Native\\Laravel\\Facades\\MenuBar",
97+
"Notification": "Native\\Laravel\\Facades\\Notification",
98+
"PowerMonitor": "Native\\Laravel\\Facades\\PowerMonitor",
9199
"Process": "Native\\Laravel\\Facades\\Process",
92-
"Window": "Native\\Laravel\\Facades\\Window",
93-
"Clipboard": "Native\\Laravel\\Facades\\Clipboard"
100+
"QueueWorker": "Native\\Laravel\\Facades\\QueueWorker",
101+
"Screen": "Native\\Laravel\\Facades\\Screen",
102+
"Settings": "Native\\Laravel\\Facades\\Settings",
103+
"Shell": "Native\\Laravel\\Facades\\Shell",
104+
"System": "Native\\Laravel\\Facades\\System",
105+
"Window": "Native\\Laravel\\Facades\\Window"
94106
}
95107
}
96108
},

config/nativephp.php

+17-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* It is used to determine if the app needs to be updated.
77
* Increment this value every time you release a new version of your app.
88
*/
9-
'version' => env('NATIVEPHP_APP_VERSION', 1),
9+
'version' => env('NATIVEPHP_APP_VERSION', '1.0.0'),
1010

1111
/**
1212
* The ID of your application. This should be a unique identifier
@@ -64,8 +64,8 @@
6464
'build',
6565
'temp',
6666
'content',
67-
'storage/app/framework/{sessions,testing,cache}',
68-
'storage/logs/laravel.log',
67+
'node_modules',
68+
'*/tests',
6969
],
7070

7171
/**
@@ -118,6 +118,9 @@
118118
],
119119
],
120120

121+
/**
122+
* The queue workers that get auto-started on your application start.
123+
*/
121124
'queue_workers' => [
122125
'default' => [
123126
'queues' => ['default'],
@@ -126,6 +129,17 @@
126129
],
127130
],
128131

132+
/**
133+
* Define your own scripts to run before and after the build process.
134+
*/
135+
'prebuild' => [
136+
// 'npm run build',
137+
],
138+
139+
'postbuild' => [
140+
// 'rm -rf public/build',
141+
],
142+
129143
/**
130144
* Custom PHP binary path.
131145
*/

phpstan.neon

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ parameters:
99
# Level 9 is the highest level
1010
level: 5
1111

12+
13+
noEnvCallsOutsideOfConfig: false # Don't know why he doesn't consider our config/ directory as config
14+
1215
ignoreErrors:
1316
- '#Class App\\Providers\\NativeAppServiceProvider not found#'
1417
- '#Class Native\\Laravel\\ChildProcess has an uninitialized readonly property#'
1518

16-
#
17-
# excludePaths:
18-
# - ./*/*/FileToBeExcluded.php
19+
20+
excludePaths:
21+
- ./src/NativeServiceProvider.php

src/Commands/LoadPHPConfigurationCommand.php

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ public function handle()
1414
/** @var ProvidesPhpIni $provider */
1515
$provider = app(config('nativephp.provider'));
1616
$phpIni = [];
17+
18+
/* * @phpstan-ignore-next-line */
1719
if (method_exists($provider, 'phpIni')) {
1820
$phpIni = $provider->phpIni();
1921
}

0 commit comments

Comments
 (0)