Skip to content

fix cli scheduler:run breaks if --live-site does not end with / #123

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

Merged
Hackwar merged 5 commits into from
Jul 4, 2025
Merged

fix cli scheduler:run breaks if --live-site does not end with / #123

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c92b9db
fix cli scheduler:run breaks if --live-site does not end with /
svanschu Feb 23, 2024
872e959
Use str_starts_with/str_ends_with instead
Hackwar Jul 4, 2025
c294a89
Reverting previous commit
Hackwar Jul 4, 2025
3d99ac9
Use str_starts_with and str_ends_with properly
Hackwar Jul 4, 2025
7609f8e
Merge branch '3.x-dev' into 3.x-dev
Hackwar Jul 4, 2025
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
6 changes: 5 additions & 1 deletion src/AbstractWebApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@

// Iterate through the encodings and attempt to compress the data using any found supported encodings.
foreach ($encodings as $encoding) {
if (($supported[$encoding] == 'gz') || ($supported[$encoding] == 'deflate')) {

Check failure on line 324 in src/AbstractWebApplication.php

View workflow job for this annotation

GitHub Actions / framework-ci / Run PHPstan 

Right side of || is always true.
// Verify that the server supports gzip compression before we attempt to gzip encode the data.
// @codeCoverageIgnoreStart
if (!\extension_loaded('zlib') || \ini_get('zlib.output_compression')) {
Expand Down Expand Up @@ -492,7 +492,7 @@
$status = $status ? 301 : 303;
}

if (!\is_int($status) && !$this->isRedirectState($status)) {

Check failure on line 495 in src/AbstractWebApplication.php

View workflow job for this annotation

GitHub Actions / framework-ci / Run PHPstan 

Result of && is always false.
throw new \InvalidArgumentException('You have not supplied a valid HTTP status code');
}

Expand Down Expand Up @@ -817,7 +817,11 @@
} else {
// If not in "Apache Mode" we will assume that we are in an IIS environment and proceed.
// IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS
$uri .= $this->input->server->getString('SCRIPT_NAME');
$scriptname = $this->input->server->getString('SCRIPT_NAME');
if (!str_starts_with($scriptname, '/') && !str_ends_with($uri, '/')) {
$uri .= '/';
}
$uri .= $scriptname;
$queryHost = $this->input->server->getString('QUERY_STRING', '');

// If the QUERY_STRING variable exists append it to the URI string.
Expand Down
Loading