Merge branch 'master' into add-php-tek-2027-cfp

johncongdon · web-flow · commit 7fa64f014b4e · 2026-07-14T11:50:02.000-07:00
diff --git a/.github/workflows/preview-deploy.yml b/.github/workflows/preview-deploy.yml
@@ -5,6 +5,12 @@ on:
     types:
       - completed
 
+# workflow_run needs explicit perms for PR comments.
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
 jobs:
   deploy:
     runs-on: "ubuntu-22.04"
diff --git a/ChangeLog-8.php b/ChangeLog-8.php
@@ -230,7 +230,7 @@
 </ul></li>
 <li>Streams:
 <ul>
-  <li>Fixed bug <?php githubissuel('php/php-src', 21468); ?> (Segfault in file_get_contents w/ a https URL and a proxy set).</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 21468); ?> (Segfault in file_get_contents w/ a https URL and a proxy set). (CVE-2026-12184)</li>
 </ul></li>
 <li>URI:
 <ul>
@@ -1155,7 +1155,7 @@
 </ul></li>
 <li>OpenSSL:
 <ul>
-  <li>Fixed bug <?php githubissuel('php/php-src', 22187); ?> (Memory corruption (zend_mm_heap corrupted) in openssl_encrypt with AES-WRAP-PAD).</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 22187); ?> (Memory corruption (zend_mm_heap corrupted) in openssl_encrypt with AES-WRAP-PAD). (CVE-2026-14355)</li>
 </ul></li>
 <li>Phar:
 <ul>
@@ -1313,7 +1313,7 @@
 </ul></li>
 <li>Streams:
 <ul>
-  <li>Fixed bug <?php githubissuel('php/php-src', 21468); ?> (Segfault in file_get_contents w/ a https URL and a proxy set).</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 21468); ?> (Segfault in file_get_contents w/ a https URL and a proxy set). (CVE-2026-12184)</li>
 </ul></li>
 <li>XSL:
 <ul>
diff --git a/archive/archive.xml b/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/2026-07-13-1.xml"/>
   <xi:include href="entries/2026-07-07-1.xml"/>
   <xi:include href="entries/2026-07-02-5.xml"/>
   <xi:include href="entries/2026-07-02-4.xml"/>
diff --git a/archive/entries/2026-07-13-1.xml b/archive/entries/2026-07-13-1.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://php.net/ns/news">
+  <title>International PHP Conference Munich 2026</title>
+  <id>https://www.php.net/archive/2026.php#2026-07-13-1</id>
+  <published>2026-07-13T17:01:37+00:00</published>
+  <updated>2026-07-13T17:01:37+00:00</updated>
+  <link href="https://www.php.net/conferences/index.php#2026-07-13-1" rel="alternate" type="text/html"/>
+  <link href="https://phpconference.com/munich/" rel="via" type="text/html"/>
+  <default:finalTeaserDate xmlns="http://php.net/ns/news">2026-10-26</default:finalTeaserDate>
+  <category term="conferences" label="Conference announcement"/>
+  <default:newsImage xmlns="http://php.net/ns/news" link="https://phpconference.com/munich/" title="International PHP Conference Munich 2026">IPC.png</default:newsImage>
+  <content type="xhtml">
+    <div xmlns="http://www.w3.org/1999/xhtml">
+      <p>
+        <a href="https://phpconference.com/munich/">The International PHP Conference</a>
+        is the world's first PHP conference and has stood for more than two decades for top-notch
+        pragmatic expertise in PHP and web technologies. At the IPC, internationally renowned
+        experts from the PHP industry meet up with PHP users and developers from large and small
+        companies. Here is the place where concepts emerge and ideas are born – the IPC signifies
+        knowledge transfer at the highest level.
+      </p>
+
+      <p>Basic facts:</p>
+
+      <p>
+        <strong>Date: October 26 – 30, 2026</strong>
+      </p>
+
+      <p>
+        <strong>Location: Holiday Inn Munich City Centre, Munich or Online</strong>
+      </p>
+
+      <p>Highlights:</p>
+      <ul>
+        <li>60+ best practice sessions</li>
+        <li>50+ international top speakers</li>
+        <li>PHPower: Hands-on Power Workshops</li>
+        <li>2-Day Bootcamp on Thursday and Friday</li>
+        <li>Expo with exciting exhibitors on October 27 &amp; 28</li>
+        <li>All inclusive: Changing buffets, snacks &amp; refreshing drinks</li>
+        <li>Official certificate for attendees</li>
+        <li>Free Goodies: Developer bag, T-Shirt, magazines etc.</li>
+        <li>Exclusive networking events</li>
+      </ul>
+
+      <p>
+        For further information on the International PHP Conference Munich visit:
+        <a href="https://phpconference.com/munich/">https://phpconference.com/munich/</a>
+      </p>
+    </div>
+  </content>
+</entry>
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "ext-curl": "*",
-        "friendsofphp/php-cs-fixer": "^3.95.11",
+        "friendsofphp/php-cs-fixer": "^3.95.13",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^2.2",
         "phpstan/phpstan-phpunit": "^2.0",
diff --git a/composer.lock b/composer.lock
diff --git a/docs.php b/docs.php
@@ -9,7 +9,6 @@
     "Documentation",
     [
         "current" => "docs",
-        'intro' => $intro,
         'cache_control' => 5 * 60, // 5 minutes
     ]
 );
diff --git a/include/header.inc b/include/header.inc
@@ -51,7 +51,7 @@ if ($config["cache"]) {
 }
 
 if ($config["cache_control"] && is_numeric($config["cache_control"])) {
-	header("Cache-Control: public, max-age=" . (int) $config["cache_control"]);
+    header("Cache-Control: public, max-age=" . (int) $config["cache_control"]);
 }
 
 if (!isset($config["languages"])) {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -435,7 +435,7 @@ parameters:
 		-
 			message: '#^Variable \$config might not be defined\.$#'
 			identifier: variable.undefined
-			count: 3
+			count: 6
 			path: include/header.inc
 
 		-

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`"Documentation",`
`10`	`10`	`[`
`11`	`11`	`"current" => "docs",`
`12`		`- 'intro' => $intro,`
`13`	`12`	`'cache_control' => 5 * 60, // 5 minutes`
`14`	`13`	`]`
`15`	`14`	`);`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ if ($config["cache"]) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`if ($config["cache_control"] && is_numeric($config["cache_control"])) {`
`54`		`- header("Cache-Control: public, max-age=" . (int) $config["cache_control"]);`
	`54`	`+ header("Cache-Control: public, max-age=" . (int) $config["cache_control"]);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if (!isset($config["languages"])) {`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ parameters:`
`435`	`435`	`-`
`436`	`436`	`message: '#^Variable \$config might not be defined\.$#'`
`437`	`437`	`identifier: variable.undefined`
`438`		`- count: 3`
	`438`	`+ count: 6`
`439`	`439`	`path: include/header.inc`
`440`	`440`
`441`	`441`	`-`