V4 (#496)

* core: Update CI scripts

* core: Update CI scripts

* refactor: simplify entry point

* refactor: simplify start function - moving responsibility to RequestHandler

* refactor: simplify lifecycle class with better documentation

* refactor: all lifecycle responsibility taken away from Request - closes #307

* add todos

* refactor: remove all redundant code

* build: update dependencies

* feature: default router

* feature: default config

* refactor: simplify lifecycle

* refactor: split view into HTML/Null

* refactor: remove old lifecycle functions

* refactor: tidy up stan feedback

* wip: improving v4 routing

* build: upgrade to DOM v3 RC 1

* feature: expand DOM components

* tweak: remove commented code

* build: upgrade to stable versions

* build: upgrade to stable version of logger

* build: raise minimum stability

* feature: handle modular content

* build: require database

* feature: database in the service container

* config: add default binaries for webpack/sass

* config: remove build binaries

* build: require phpgt/sync

* build: update default filename for es6 module packing

* wip: remove uri filter

* wip: add dynamic path to service container

* wip: lazy load database

* wip: refactor service container

* wip: autoload project classes

* wip: call project service loader

* Revert "wip: remove uri filter"

This reverts commit dd06666

* wip: do not filter out dynamic files

* build: stable release of routing

* build: new release of domtemplate

* wip: remove debugging

* tidy: remove unused imports

* wip: clean bind attributes

* wip: pass default database collation/charset

* wip: improve nested dynamic routing

* wip: replace hyphens in do actions

* wip: output path to body class

* wip: expose request uri as service

* wip: differentiate between uri/dir in body class

* wip: set request uri in service container

* wip: working on csrf

* wip: call go_after

* wip: expose server as service

* wip: expose config as service

* wip: update session

* wip: update routing dependency

* build: upgrade dependencies

* wip: if there is no session yet, pass null to suppress warning

* wip: improve routing

* build: update dependencies

* router: sort headers and footers to allow nesting

* wip: force all URLs to end with a slash

* wip: commend redirection

* build: update deps

* tweak: rename modular->partial

* tweak: rename bindAttributes->datasets

* tweak: remove autoloader debug

* tweak: pass dependencies to table binder

* simplify: routing header/footer ordering

* feature: output dynamic URLs to the body tag

* tweak: enforce current working dir

* tweak: suppress comparison warning (for introducing custom error handler)

* tweak: pass exceptions to custom error handler

* check if init.php exists before including

* build: upgrade dependencies

* build: remove behat dependencies

* routing: default router matches page-route by default

* build: bump dependencies

* hotfix: fix typo in routing header matcher

* Retain query string on redirect
Fixes #486

* build: upgrade ci

* build: upgrade deps

Author: Greg Bowler

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+# These are supported funding model platforms
+github: [phpgt]

.github/workflows/ci.yml

@@ -3,44 +3,64 @@ name: CI
 on: [push]
 
 jobs:
-  build:
+  composer:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-      - uses: php-actions/composer@v2
-      - name: Upload build for test runner
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: /tmp/composer-cache
+          key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
+
+      - uses: php-actions/composer@v6
+
+      - name: Archive build
+        run: mkdir /tmp/github-actions/ && tar -cvf /tmp/github-actions/build.tar ./
+
+      - name: Upload build archive for test runners
         uses: actions/upload-artifact@v2
         with:
           name: build-artifact
-          path: ./
+          path: /tmp/github-actions
 
   phpunit:
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [composer]
 
     steps:
       - uses: actions/download-artifact@v2
         with:
           name: build-artifact
-          path: ./
+          path: /tmp/github-actions
+
+      - name: Extract build archive
+        run: tar -xvf /tmp/github-actions/build.tar ./
 
       - name: PHP Unit tests
-        uses: php-actions/phpunit@v9
+        uses: php-actions/phpunit@v3
         with:
+          php_version: 8.0
+          php_extensions: xdebug
           configuration: test/phpunit/phpunit.xml
+          bootstrap: vendor/autoload.php
 
   phpstan:
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [composer]
 
     steps:
       - uses: actions/download-artifact@v2
         with:
           name: build-artifact
-          path: ./
+          path: /tmp/github-actions
+
+      - name: Extract build archive
+        run: tar -xvf /tmp/github-actions/build.tar ./
 
       - name: PHP Static Analysis
-        uses: php-actions/phpstan@master
+        uses: php-actions/phpstan@v3
         with:
-          path: src/
+          path: src/

.scrutinizer.yml

@@ -1,14 +1,25 @@
 build:
   environment:
-    php:
-      version: 7.4.0
-  tests:
-    override:
-      -
-        command: 'vendor/bin/phpunit test/unit --coverage-clover coverage --whitelist src'
-        coverage:
-          file: 'coverage'
-          format: 'php-clover'
+    php: 8.0.0
+
+  nodes:
+    analysis:
+      tests:
+        override:
+          - php-scrutinizer-run
+
+    tests-and-coverage:
+      environment:
+        php:
+          ini:
+            "xdebug.mode": coverage
+      tests:
+        override:
+          - phpcs-run ./src
+          - command: "vendor/bin/phpunit test/phpunit --coverage-clover test/phpunit/_coverage --whitelist src"
+            coverage:
+              file: "test/phpunit/_coverage"
+              format: "php-clover"
 
 checks:
   php:
@@ -18,4 +29,4 @@ checks:
 filter:
   excluded_paths:
     - test/*
-    - vendor/*
+    - vendor/*

build.default.json

@@ -3,12 +3,11 @@
 		"require": {
 			"node": "*",
 			"babel": "*",
-			"webpack": "*",
-			"webpack-cli": "*"
+			"webpack": "*"
 		},
 		"execute": {
-			"command": "webpack-cli",
-			"arguments": ["build", "--mode=development", "--devtool=source-map", "--entry=./script/main.es6", "--output-filename=script.js", "--output-path=./www"]
+			"command": "webpack",
+			"arguments": ["--entry","./script/main.es6", "--output-path", "./www", "--output-filename", "script.js", "--devtool", "source-map", "--mode", "production"]
 		}
 	},
 

composer.json

@@ -13,32 +13,26 @@
 		"ext-dom": "*",
 		"ext-json": "*",
 		"php": ">=8.0",
-		"phpgt/build": "^1.0",
-		"phpgt/cli": "^1.3",
+
 		"phpgt/config": "^1.0",
-		"phpgt/cookie": "^1.0",
-		"phpgt/cron": "^1.0",
-		"phpgt/csrf": "^1.6",
-		"phpgt/database": "^1.1",
-		"phpgt/dom": "v3.0.0",
-		"phpgt/domtemplate": "^1.3 || ^2.0",
-		"phpgt/fetch": "^1.0",
+		"phpgt/csrf": "^1.7.2",
+		"phpgt/dom": "^3.0.0",
+		"phpgt/domtemplate": "^2.0",
+		"phpgt/database": "^1.4",
 		"phpgt/http": "^1.0",
-		"phpgt/input": "^1.1",
-		"phpgt/protectedglobal": "^1.0",
-		"phpgt/server": "^1.1",
-		"phpgt/session": "^1.1",
+		"phpgt/logger": "^1.0",
+		"phpgt/routing": "^1.0",
+		"phpgt/servicecontainer": "^1.1.1",
+		"phpgt/session": "^1.1.2",
 		"phpgt/sync": "^1.2",
 
 		"psr/http-server-middleware": "^1.0",
 		"willdurand/negotiation": "^3.0"
 	},
 
 	"require-dev": {
-		"phpunit/phpunit": "8.* || 9.*",
-		"behat/behat": "^3.0.5",
-		"behat/mink-extension": "^2.3",
-		"behat/mink-goutte-driver": "^1.2"
+		"phpstan/phpstan": "^1.4",
+		"phpunit/phpunit": "^9.5"
 	},
 
 	"autoload": {
@@ -63,5 +57,12 @@
 		"router",
 		"toolbox",
 		"prototype"
+	],
+
+	"funding": [
+		{
+			"type": "github",
+			"url": "https://github.com/sponsors/PhpGt"
+		}
 	]
 }