[Preview - Part 2] Basic Framework

.github/workflows/integrate.yaml

@@ -9,50 +9,50 @@ on:
       - "master"
 
 jobs:
-  code-coverage:
-    name: "Code Coverage"
-
-    runs-on: "ubuntu-latest"
-
-    strategy:
-      matrix:
-        php-version:
-          - "8.4"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v6"
-
-      - name: "Set up PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "xdebug"
-          extensions: "none, curl, dom, json, mbstring, tokenizer, xml, xmlwriter, iconv"
-          php-version: "${{ matrix.php-version }}"
-
-      - name: "Set up problem matchers for PHP"
-        run: "echo \"::add-matcher::${{ runner.tool_cache }}/php.json\""
-
-      - name: "Set up problem matchers for phpunit/phpunit"
-        run: "echo \"::add-matcher::${{ runner.tool_cache }}/phpunit.json\""
-
-      - name: "Determine composer cache directory"
-        run: "echo \"COMPOSER_CACHE_DIR=$(composer config cache-dir)\" >> $GITHUB_ENV"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v5"
-        with:
-          path: "${{ env.COMPOSER_CACHE_DIR }}"
-          key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-"
-
-      - name: "Install dependencies with composer"
-        run: "composer install --ansi --no-interaction --no-progress"
-
-      - name: "Collect code coverage from running unit tests with phpunit/phpunit"
-        env:
-          XDEBUG_MODE: "coverage"
-        run: "vendor/bin/phpunit --colors=always --configuration=tests/phpunit.xml --coverage-text --testsuite=unit"
+#  code-coverage:
+#    name: "Code Coverage"
+#
+#    runs-on: "ubuntu-latest"
+#
+#    strategy:
+#      matrix:
+#        php-version:
+#          - "8.4"
+#
+#    steps:
+#      - name: "Checkout"
+#        uses: "actions/checkout@v6"
+#
+#      - name: "Set up PHP"
+#        uses: "shivammathur/setup-php@v2"
+#        with:
+#          coverage: "xdebug"
+#          extensions: "none, curl, dom, json, mbstring, tokenizer, xml, xmlwriter, iconv"
+#          php-version: "${{ matrix.php-version }}"
+#
+#      - name: "Set up problem matchers for PHP"
+#        run: "echo \"::add-matcher::${{ runner.tool_cache }}/php.json\""
+#
+#      - name: "Set up problem matchers for phpunit/phpunit"
+#        run: "echo \"::add-matcher::${{ runner.tool_cache }}/phpunit.json\""
+#
+#      - name: "Determine composer cache directory"
+#        run: "echo \"COMPOSER_CACHE_DIR=$(composer config cache-dir)\" >> $GITHUB_ENV"
+#
+#      - name: "Cache dependencies installed with composer"
+#        uses: "actions/cache@v5"
+#        with:
+#          path: "${{ env.COMPOSER_CACHE_DIR }}"
+#          key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.lock') }}"
+#          restore-keys: "php-${{ matrix.php-version }}-composer-"
+#
+#      - name: "Install dependencies with composer"
+#        run: "composer install --ansi --no-interaction --no-progress"
+#
+#      - name: "Collect code coverage from running unit tests with phpunit/phpunit"
+#        env:
+#          XDEBUG_MODE: "coverage"
+#        run: "vendor/bin/phpunit --colors=always --configuration=tests/phpunit.xml --coverage-text --testsuite=unit"
 
   coding-standards:
     name: "Coding Standards"
@@ -193,11 +193,14 @@ 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"
 
-      - 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"

README.md

@@ -13,7 +13,7 @@ git clone https://github.com/php/web-php.git
 Change into `web-php`:
 
 ```
-cd web-php
+cd web-php/public
 ```
 
 Start the built-in web server:

bin/build.php

@@ -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());

bin/bumpRelease

@@ -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) {
@@ -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",
 ]);

bin/createReleaseEntry

@@ -57,7 +57,7 @@ if (isset($opts['r'])) {
 	$release = strtr($version, '.', '_') . '.php';
 	file_put_contents(RELEASES_ABS . $release, "<?php
 \$_SERVER['BASE_PAGE'] = 'releases/$release';
-include_once __DIR__ . '/../include/prepend.inc';
+require_once __DIR__ . '/../../include/prepend.inc';
 site_header('PHP $version Release Announcement');
 ?>
 <h1>PHP $version Release Announcement</h1>

composer.json

@@ -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": "*",
@@ -30,7 +37,7 @@
     },
     "config": {
         "platform": {
-            "php": "8.4.0"
+            "php": "8.4.1"
         },
         "sort-packages": true,
         "allow-plugins": {