Merge branch 'php:master' into master

Author: arhimede

.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/workflows/pr-preview.yml

@@ -21,14 +21,14 @@ jobs:
           SCRIPT_BEFORE: bash /home/thephpfoundation/scripts/pr_created_pre.sh web-php ${{ github.event.number }}
           SCRIPT_AFTER: bash /home/thephpfoundation/scripts/pr_created.sh web-php ${{ github.event.number }}
 
-      - uses: peter-evans/find-comment@v3
+      - uses: peter-evans/find-comment@v4
         id: fc
         with:
           issue-number: ${{ github.event.number }}
           comment-author: 'github-actions[bot]'
           body-includes: 'Preview for commit'
 
-      - uses: peter-evans/create-or-update-comment@v4
+      - uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.number }}
           comment-id: ${{ steps.fc.outputs.comment-id }}
@@ -113,15 +113,15 @@ jobs:
           TARGET: "/home/thephpfoundation/preview/web-php-regression-report-pr-${{ github.event.number }}/public"
           SCRIPT_BEFORE: bash /home/thephpfoundation/scripts/pr_created_pre.sh web-php-regression-report ${{ github.event.number }}
 
-      - uses: peter-evans/find-comment@v3
+      - uses: peter-evans/find-comment@v4
         if: ${{ !cancelled() }}
         id: snapshot
         with:
           issue-number: ${{ github.event.number }}
           comment-author: 'github-actions[bot]'
           body-includes: 'Regression report for commit'
 
-      - uses: peter-evans/create-or-update-comment@v4
+      - uses: peter-evans/create-or-update-comment@v5
         if: ${{ !cancelled() }}
         with:
           issue-number: ${{ github.event.number }}

archive/archive.xml

@@ -9,6 +9,7 @@
     <uri>http://php.net/contact</uri>
     <email>php-webmaster@lists.php.net</email>
   </author>
+  <xi:include href="entries/2025-10-03-1.xml"/>
   <xi:include href="entries/2025-09-25-3.xml"/>
   <xi:include href="entries/2025-09-25-2.xml"/>
   <xi:include href="entries/2025-09-25-1.xml"/>

archive/entries/2025-10-03-1.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://php.net/ns/news">
+  <title>PHP Conference Fukuoka 2025</title>
+  <id>https://www.php.net/archive/2025.php#2025-10-03-1</id>
+  <published>2025-10-03T14:03:22+00:00</published>
+  <updated>2025-10-03T14:03:22+00:00</updated>
+  <link href="https://www.php.net/conferences/index.php#2025-10-03-1" rel="alternate" type="text/html"/>
+  <link href="https://phpcon.fukuoka.jp/2025/" rel="via" type="text/html"/>
+  <default:finalTeaserDate xmlns="http://php.net/ns/news">2025-11-08</default:finalTeaserDate>
+  <category term="conferences" label="Conference announcement"/>
+  <default:newsImage xmlns="http://php.net/ns/news" link="https://phpcon.fukuoka.jp/2025/" title="PHP Conference Fukuoka 2025">phpconfuk2025.png</default:newsImage>
+  <content type="xhtml">
+    <div xmlns="http://www.w3.org/1999/xhtml">
+     <p>
+         We are pleased to announce the PHP Conference Fukuoka 2025.
+     </p>
+     <p>
+         PHP Conference Fukuoka celebrates its 10th anniversary this year, and this edition will be the final one.<br/>
+         Since its first edition in 2015, the conference has aimed to boost the IT industry in the Kyushu region and provide a place where PHPers from Kyushu and all over Japan can connect and exchange ideas.<br/>
+         We hope this last gathering will once again inspire participants, spark new ideas, and create lasting connections. (The conference will be conducted in Japanese)
+     </p>
+     <strong>Basic facts</strong><br/>
+     <ul>
+         <li>Date: November 8, 2025 (JST)</li>
+         <li>Location: Fukuoka, Japan</li>
+     </ul>
+     <p>
+         For more information, please visit the event page: <a href="https://phpcon.fukuoka.jp/2025/">PHP Conference Fukuoka 2025</a>.
+     </p>
+     <p>
+         Follow us on <a href="https://x.com/phpcon_fukuoka">X</a>.
+     </p>
+     
+     
+    </div>
+  </content>
+</entry>

composer.json

@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "ext-curl": "*",
-        "friendsofphp/php-cs-fixer": "^3.87.2",
+        "friendsofphp/php-cs-fixer": "^3.88.2",
         "phpunit/phpunit": "^11.5.6"
     },
     "autoload": {