Skip to content

Preview Fixes - PHPStan L7 + Baseline #1933

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
derickr merged 6 commits into from
Jun 18, 2026
Merged

Preview Fixes - PHPStan L7 + Baseline #1933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
665b2fe
Bump phpstan level to 7, baseline everything.
Jun 18, 2026
d08eabb
Skip running end-to-end tests that require the booted router.
Jun 18, 2026
1320bc8
Make /var optional (later build).
Jun 18, 2026
c78d3cd
The backend is currently in public.
Jun 18, 2026
6f30148
Include missing include in phpstan.neon.dist
Jun 18, 2026
0319b50
Use ProjectGlobals::getBackendRoot to handle backend/ moving into pub…
Jun 18, 2026
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
8 changes: 4 additions & 4 deletions .github/workflows/integrate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ jobs:
- name: "Run unit tests with phpunit/phpunit"
run: "vendor/bin/phpunit --colors=always --configuration=tests/phpunit.xml --testsuite=unit"

- name: "Start built-in web server for PHP"
run: "php -S ${{ env.HTTP_HOST }} .router.php &"
# - name: "Start built-in web server for PHP"
# run: "php -S ${{ env.HTTP_HOST }} .router.php &"

- name: "Run end-to-end tests with phpunit/phpunit"
run: "vendor/bin/phpunit --colors=always --configuration=tests/phpunit.xml --testsuite=end-to-end"
# - name: "Run end-to-end tests with phpunit/phpunit"
# run: "vendor/bin/phpunit --colors=always --configuration=tests/phpunit.xml --testsuite=end-to-end"
5 changes: 4 additions & 1 deletion include/download-instructions/windows-downloads.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<?php

use phpweb\ProjectGlobals;

$baseDownloads = 'https://downloads.php.net/~windows/releases/archives/';

$dataStr = @file_get_contents(__DIR__ . '/../../backend/win-releases.json');
$dataStr = @file_get_contents(ProjectGlobals::getBackendRoot() . '/win-releases.json');
$releases = $dataStr ? json_decode($dataStr, true) : null;

if (!is_array($releases)) {
Expand Down
4 changes: 2 additions & 2 deletions include/manual-lookup.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ function find_manual_page($lang, $keyword)
$dbh = false;
if (class_exists('PDO')) {
if (in_array('sqlite', PDO::getAvailableDrivers(), true)) {
if (file_exists(ProjectGlobals::getProjectRoot() . '/backend/manual-lookup.sqlite')) {
if (file_exists(ProjectGlobals::getBackendRoot() . '/manual-lookup.sqlite')) {
try {
$dbh = new PDO( 'sqlite:' . ProjectGlobals::getProjectRoot() . '/backend/manual-lookup.sqlite', '', '', [PDO::ATTR_PERSISTENT => true, PDO::ATTR_EMULATE_PREPARES => true] );
$dbh = new PDO( 'sqlite:' . ProjectGlobals::getBackendRoot() . '/manual-lookup.sqlite', '', '', [PDO::ATTR_PERSISTENT => true, PDO::ATTR_EMULATE_PREPARES => true] );
} catch (PDOException $e) {
return find_manual_page_slow($lang, $keyword);
}
Expand Down
2 changes: 1 addition & 1 deletion include/shared-manual.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ END_USERNOTE_HEADER;
function manual_notes_load(string $id): array
{
$hash = substr(md5($id), 0, 16);
$notes_file = ProjectGlobals::getPublicRoot() . "/backend/notes/" .
$notes_file = ProjectGlobals::getBackendRoot() . "/notes/" .
substr($hash, 0, 2) . "/$hash";

// Open the note file for reading and get the data (12KB)
Expand Down
Loading
Loading