feat!: require php ^8.0 (#881)

helsingborg-stad · Feb 20, 2024 · d64a332 · d64a332
1 parent c420ce9
commit d64a332
Show file tree

Hide file tree

Showing 14 changed files with 277 additions and 451 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "PHP",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/php:0-7.4-bullseye",
+	"image": "mcr.microsoft.com/devcontainers/php:1-8.3-bullseye",
 
 	// Configure tool-specific properties.
 	// "customizations": {},
@@ -17,10 +17,20 @@
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
 			"version": "16.19.0"
+		},
+		"ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
+			"packages": "nano,bash-completion"
 		}
 	},
 
 	"customizations": {
+		"vscode": {
+			"extensions": [
+				"github.vscode-pull-request-github",
+				"GitHub.copilot",
+				"ritwickdey.LiveServer"
+			]
+		},
 		"codespaces": {
 			"repositories": {
 				"helsingborg-stad/component-library": {
@@ -32,7 +42,8 @@
 
 	// Use 'postCreateCommand' to run commands after the container is created.
 	"postCreateCommand": {
-		"install-apt-packages": "export YARNKEY=yarn-keyring.gpg && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo gpg --dearmour -o /usr/share/keyrings/$YARNKEY && echo \"deb [signed-by=/usr/share/keyrings/$YARNKEY] https://dl.yarnpkg.com/debian stable main\" | sudo tee /etc/apt/sources.list.d/yarn.list && sudo apt-get update && sudo apt-get install -y subversion nano bash-completion",
+		"symlink-to-www": "sudo chmod a+x \"$(pwd)\" && sudo rm -rf /var/www/html && sudo ln -s \"$(pwd)\" /var/www/html",
+		"apache": "sudo a2enmod rewrite headers && service apache2 start"
 	},
 
 	"waitFor": "postCreateCommand"

diff --git a/.devcontainer/styleguide.code-workspace b/.devcontainer/styleguide.code-workspace
@@ -2,7 +2,7 @@
     "folders": [
         {
             "path": "..",
-            "name": "styleguide",
+            "name": "styleguide"
         },
         {
             "path": "../source/library",

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup PHP with composer v2
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.2'
         tools: composer:v2
 
 

diff --git a/.github/workflows/deploy-modul-test-municipio.yml b/.github/workflows/deploy-modul-test-municipio.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup PHP with composer v2
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.2'
         tools: composer:v2
 
     - name: Validate composer.json and composer.lock

diff --git a/.github/workflows/npm-publish-and-release.yml b/.github/workflows/npm-publish-and-release.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup PHP with composer v2
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.2'
         tools: composer:v2
 
     - name: NPM Install.

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.2'
         tools: composer:v2
 
     - name: Install composer packages

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -10,9 +10,16 @@
             "problemMatcher": []
         },
         {
-            "label": "Serve",
+            "label": "Watch",
             "type": "shell",
-            "command": "php -S 0.0.0.0:8080",
+            "command": "npm run watch",
+            "problemMatcher": []
+        },
+        {
+            "label": "Test:Watch",
+            "type": "shell",
+            "group": "test",
+            "command": "npm run test:watch",
             "problemMatcher": []
         },
     ]

diff --git a/cli.php b/cli.php
@@ -1,5 +1,7 @@
 <?php
 
+use HelsingborgStad\GlobalBladeService\GlobalBladeService;
+
 class CLI
 {
 
@@ -28,10 +30,9 @@ private function renderComponent(string $componentClass, string $view, string $c
         $component = new $componentClass($data);
 
         $data = $component->getData();
-        $bladeEngine = $init->getEngine();
-        $bladeViewRenderer = \HelsingborgStad\RenderBladeView\BladeViewRenderer::create($bladeEngine);
+        $blade = GlobalBladeService::getInstance();
 
-        return $bladeViewRenderer->render($view, $data);
+        return $blade->makeView($view, $data)->render();
     }
 }
 

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
             "email": "[email protected]"
         }
     ],
-    "minimum-stability" : "dev",
+    "minimum-stability" : "stable",
     "repositories": [
         {
             "type":"composer",
@@ -33,7 +33,8 @@
     ],
     "require": {
         "erusev/parsedown": "^1.7",
-        "helsingborg-stad/blade-engine-wrapper": "1.0.0"
+        "php": "^8.0",
+        "helsingborg-stad/blade": "^3.0"
     },
     "scripts": {
         "post-install-cmd": [