Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to run Laravel under custom vendor location #131

Merged
merged 22 commits into from
Mar 3, 2024
Merged

Allow to run Laravel under custom vendor location #131

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2542004
Allow running with Custom Vendor location
deleugpn Sep 26, 2023
4728576
Allow Bref-init to run with custom vendor
deleugpn Sep 26, 2023
7b9da48
Coding Style
deleugpn Sep 26, 2023
d77f507
use realpath()
deleugpn Sep 26, 2023
adaa506
use realpath()
deleugpn Sep 26, 2023
70d36a1
Keep existing behavior unchanged for better BC compatibility
deleugpn Sep 26, 2023
b0af019
syntax
deleugpn Sep 26, 2023
4d3627d
variable
deleugpn Sep 26, 2023
74f4192
syntax
deleugpn Sep 26, 2023
e516f0a
func
deleugpn Sep 26, 2023
d283a70
Add comment
deleugpn Sep 27, 2023
f7a8b08
Implement same logic on bref-init
alustau Nov 6, 2023
06438bc
Merge pull request #135 from alustau/implement-custom-vendor-placement
deleugpn Nov 6, 2023
cf8341c
Fix coding standards
alustau Nov 6, 2023
e6b346c
Merge pull request #136 from alustau/implement-custom-vendor-placement
deleugpn Nov 6, 2023
ad2c698
Add slash in the end of laravel home path when use realpath
alustau Nov 13, 2023
235b2fa
Merge pull request #142 from brefphp/support-php-83
deleugpn Nov 23, 2023
727e4f0
Merge pull request #140 from alustau/implement-custom-vendor-placement
deleugpn Nov 24, 2023
f604978
final refactoring this time for real
deleugpn Nov 24, 2023
70976ec
add comment about reason for the code (BC)
deleugpn Nov 24, 2023
6e242be
add more realistic log message
deleugpn Nov 24, 2023
d27c72b
Merge branch 'master' into custom-vendor-placement
deleugpn Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/HandlerResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ private function laravel(): Application
return $this->laravel;
}

$bootstrapFile = getcwd() . '/bootstrap/app.php';
// ./vendor/bref/laravel-bridge/src/
$bootstrapFile = __DIR__ . '/../../../../bootstrap/app.php';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use realpath() on both strings?


if (! file_exists($bootstrapFile)) {
throw new RuntimeException(
Expand Down
6 changes: 4 additions & 2 deletions src/bref-init.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
use Bref\LaravelBridge\StorageDirectories;

Bref::beforeStartup(static function () {
$laravelHome = __DIR__ . '/../../../../';

if (! defined('STDERR')) {
define('STDERR', fopen('php://stderr', 'wb'));
}
Expand All @@ -26,7 +28,7 @@
return;
}

$defaultConfigCachePath = $_SERVER['LAMBDA_TASK_ROOT'] . '/bootstrap/cache/config.php';
$defaultConfigCachePath = $laravelHome . '/bootstrap/cache/config.php';

if (file_exists($defaultConfigCachePath)) {
return;
Expand All @@ -43,7 +45,7 @@
fwrite(STDERR, "Running 'php artisan config:cache' to cache the Laravel configuration\n");

// 1>&2 redirects the output to STDERR to avoid messing up HTTP responses with FPM
passthru('php artisan config:cache 1>&2');
passthru("php {$laravelHome}artisan config:cache 1>&2");
}
});

Expand Down