Skip to content

[Preview - Part 2] Basic Framework #1934

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

Draft
markrandall wants to merge 2 commits into
base: preview
Choose a base branch
from
Draft

[Preview - Part 2] Basic Framework #1934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a416b4d
Add more reliable way of accessing branch / version / release data wi…
Jun 17, 2026
c0c3b85
Add build / routing / services with a single demo controller.
Jun 19, 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
3 changes: 3 additions & 0 deletions .github/workflows/integrate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ jobs:
- name: "Install dependencies with composer"
run: "composer install --ansi --no-interaction --no-progress"

- name: "Execute build step"
run: "php bin/build.php"

- name: "Run unit tests with phpunit/phpunit"
run: "vendor/bin/phpunit --colors=always --configuration=tests/phpunit.xml --testsuite=unit"

Expand Down
9 changes: 9 additions & 0 deletions bin/build.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

use phpweb\Framework\Build\BuildTools;

(PHP_SAPI === 'cli') or die("Please run this script using the cli sapi");

require_once __DIR__ . '/../src/autoload.php';

exit(BuildTools::executeBuild());
13 changes: 8 additions & 5 deletions bin/bumpRelease
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
#!/usr/bin/env php
<?php

use phpweb\Releases\Branches;

(PHP_SAPI === 'cli') or die("Please run this script using the cli sapi");

require_once __DIR__ . "/../include/branches.inc";
require_once __DIR__ . "/../include/version.inc";
require_once __DIR__ . "/../include/releases.inc";
require __DIR__ . '/../include/releases.inc';
require __DIR__ . '/../src/autoload.php';

if ($_SERVER['argc'] < 1) {
fwrite(STDERR, "Usage: {$_SERVER['argv'][0]} major_version [ minor_version ]\n");
exit(1);
}

$RELEASES = Branches::getReleaseData();
$major = (int) $_SERVER['argv'][1];
isset($RELEASES[$major]) or die("Unknown major version $major");
$minor = isset($_SERVER['argv'][2]) ? (int) $_SERVER['argv'][2] : null;

$version = get_current_release_for_branch($major, $minor);
$version = Branches::getCurrentReleaseForBranch($major, $minor);
$info = $RELEASES[$major][$version] ?? null;

if ($info === null) {
Expand All @@ -34,7 +37,7 @@ $OLDRELEASES[$major] = array_merge(
);

file_put_contents(__DIR__ . "/../include/releases.inc", [
"<?php\n\$OLDRELEASES = ",
"<?php\nreturn \$OLDRELEASES = ",
var_export($OLDRELEASES, true),
";\n",
]);
Expand Down
11 changes: 9 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@
"source": "https://github.com/php/web-php"
},
"require": {
"php": "~8.4.0"
"php": "~8.4",
"ext-dom": "*",
"monolog/monolog": "^3.10",
"symfony/config": "^7.4",
"symfony/dependency-injection": "^7.4",
"symfony/http-foundation": "^7.4",
"symfony/http-kernel": "^7.4",
"symfony/routing": "^7.4"
},
"require-dev": {
"ext-curl": "*",
Expand All @@ -30,7 +37,7 @@
},
"config": {
"platform": {
"php": "8.4.0"
"php": "8.4.1"
},
"sort-packages": true,
"allow-plugins": {
Expand Down
Loading