Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	index.php

Author: curruwilla

.editorconfig

@@ -5,6 +5,10 @@ charset = utf-8
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.js]
+indent_size = 2
+indent_style = space
+
 [*.yaml]
 indent_size = 2
 indent_style = space

.github/CODEOWNERS

@@ -1 +1 @@
-* @saundefined @sy-records @sgolemon
+* @saundefined @sy-records @sgolemon @derickr

.github/ISSUE_TEMPLATE/design-contest.yml

@@ -0,0 +1,44 @@
+name: "PHP 8.5 Release Page Design Content Submission"
+description: "Submit your design for the PHP 8.5 Release Page"
+labels: ["Design Contest"]
+
+body:
+  - type: input
+    id: team
+    attributes:
+      label: "Names and Contact Details"
+      description: "Please provide your contact details"
+    validations:
+      required: true
+
+  - type: input
+    id: links
+    attributes:
+      label: "Link to mockup/prototype"
+      description: "Please provide a link to the mockup or prototype if available."
+      placeholder: "https://example.com/my-design.html"
+    validations:
+      required: true
+
+  - type: textarea
+    id: rationale
+    attributes:
+      label: "Rationale (300-600 words)"
+      description: |
+        Explain information hierarchy, layout choices, and how the design meets
+        goals. You must add 3 to 5 screenshots through "Paste, drop, or click
+        to add files".
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: license
+    attributes:
+      label: "License"
+      description: |
+        Submissions must be original. If selected, I agree to license it under
+        the [same terms as the php.net website](https://www.php.net/copyright.php) and allow
+        adaptations for implementation.
+      options:
+        - label: "I confirm, and agree."
+          required: true

.github/ISSUE_TEMPLATE/download-page.yml

@@ -8,6 +8,8 @@ body:
       value: |
         Thanks for taking the time to suggest an improvement or idea for the **Downloads Page**.
         Please provide as much detail as possible so we can understand your suggestion.
+        Please **do not** use this issue tracker for reporting issues with installing PHP, as
+        this is not a support forum. Instead head to [our support page](https://www.php.net/support.php).
 
   - type: input
     id: summary

.github/workflows/pr-preview.yml

@@ -64,7 +64,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node-version }}
 

.github/workflows/update-screenshots.yaml

@@ -33,7 +33,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node-version }}