Merge branch 'develop' into feature/fragment-of-pr-831-endpoint-imple…

…mentations

.distignore

@@ -27,6 +27,9 @@ package-lock.json
 phpcs.xml
 phpcs.xml.dist
 phpcs.ruleset.xml
+phpstan.neon
+phpstan.neon.dist
+phpstan.stubs
 phpunit.xml
 phpunit.xml.dist
 playwright.config.js

.github/scripts/create-preview-links.js → .github/scripts/playground-preview/index.js

@@ -51,9 +51,6 @@ function createBlueprint(context, number, zipArtifactUrl, phpVersion) {
 			networking: true
 		},
 		steps: [
-			{
-				step: 'enableMultisite',
-			},
 			{
 				step: 'login',
 				username: 'admin',
@@ -107,12 +104,15 @@ function createBlueprint(context, number, zipArtifactUrl, phpVersion) {
 			*/
 			{
 				step: 'unzip',
-				zipPath: '/wordpress/pr/pr.zip',
+				zipFile: {
+					resource: 'vfs',
+					path: '/wordpress/pr/pr.zip',
+				},
 				extractToPath: '/wordpress/pr',
 			},
 			{
 				step: 'installPlugin',
-				pluginZipFile: {
+				pluginData: {
 					resource: 'vfs',
 					path: '/wordpress/pr/gatherpress.zip',
 				},
@@ -124,6 +124,16 @@ function createBlueprint(context, number, zipArtifactUrl, phpVersion) {
 					url: 'https://raw.githubusercontent.com/GatherPress/gatherpress-demo-data/main/GatherPress-demo-data-2024.xml'
 				}
 			},
+			/**
+			 * Run 'enableMultisite' after the plugin activation!
+			 *
+			 * There have been some weird errors with this step, when ran after the login.
+			 * Having it here at the end -kinda- fixes the problem.
+			 * @see https://github.com/GatherPress/gatherpress/issues/950
+			 */
+			{
+				step: 'enableMultisite',
+			},
 		],
 	};
 

.github/workflows/phpstan-tests.yml

@@ -0,0 +1,44 @@
+name: PHPStan Tests
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    paths:
+    - '.github/workflows/phpstan-tests.yml'
+    - 'includes/**'
+    # - 'test/unit/php**'
+    # - '*.php'
+    - 'phpstan.neon.dist'
+    - 'composer.*'
+jobs:
+  test-phpstan:
+    name: PHPStan for WordPress
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          # phpstan requires PHP 7.1+.
+          php-version: 7.4
+          extensions: dom, iconv, json, libxml, zip
+          coverage: none
+          tools: cs2pr
+
+      - name: Composer Install
+        run: composer install --optimize-autoloader --prefer-dist
+
+      - name: Log debug information
+        run: |
+          git --version
+          php --version
+          composer --version
+
+      - name: Running PHPStan Analyze
+        if: ${{ success() || failure() }}
+        run: |
+          vendor/bin/phpstan --version
+          vendor/bin/phpstan analyze -vv --memory-limit=2G --error-format=checkstyle | cs2pr

.github/workflows/playground-preview.yml

@@ -125,5 +125,5 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const createPreviewLinks = require('.github/scripts/create-preview-links');
+            const createPreviewLinks = require('.github/scripts/playground-preview');
             createPreviewLinks(github, context);

.gitignore

@@ -32,6 +32,7 @@ typings
 # Composer #
 ##########
 vendor
+phpstan.neon
 
 # .wp-env #
 ##########

.nvmrc

@@ -1 +1 @@
-v20.16.0
+v20.18.0

.typos.toml

@@ -35,5 +35,6 @@ extend-ignore-re = [
 
 # Case insensitive, matches inside word.
 # [default.extend-words]
+"Skelton" = "Skelton"
 # bellow = "below"
 # toi = "toi"

build/blocks/add-to-calendar/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-i18n'), 'version' => '754b4dfa4e592032751e');
+<?php return array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-i18n'), 'version' => 'd363e7f0b415ef3e95a3');

build/blocks/event-date/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('moment', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n'), 'version' => '2a87e9e9bf69563aeae1');
+<?php return array('dependencies' => array('moment', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n'), 'version' => 'fbdfb147c6c684a7d803');