Merge pull request #6485 from getkirby/release/4.3.0

4.3.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,29 +1,45 @@
-## This PR …
+## Description
 <!--
 A clear and concise description of the PR.
 Use this section for review hints, explanations or discussion points/todos.
 
 Make sure to point your PR to the relevant develop branches, e.g.
 `develop-patch`, `develop-minor` or `v5/develop`
 
+How to contribute: https://contribute.getkirby.com
+-->
+
+### Summary of changes
+
+
+
+### Reasoning
+
+
+
+### Additional context
+
+
+
+## Changelog
+<!--
 Add relevant release notes: Features, Enhancements, Fixes, Deprecated.
 Reference issues from the `kirby` repo or ideas from `feedback.getkirby.com`.
 Always mention whether your PR introduces breaking changes.
-
-How to contribute: https://contribute.getkirby.com
 -->
 
 ### Fixes
 
 
+
 ### Breaking changes
 
 
 
 ## Docs
 <!--
 Add any notes that help to document the feature/changes. Doesn't need
-to be your best writing, just a few words and/or code snipptets.
+to be your best writing, just a few words and/or code snippets.
 -->
 
 
@@ -32,13 +48,11 @@ to be your best writing, just a few words and/or code snipptets.
 <!--
 If you can help to check off the following tasks, that'd be great.
 If not, don't worry - we will take care of it.
-
-More details: https://contribute.getkirby.com
 -->
 
 - [ ] In-code documentation (wherever needed)
 - [ ] Unit tests for fixed bug/feature
-- [ ] Tests and checks all pass
+- [ ] Tests and CI checks all pass
 
 ### For review team
 <!--

composer.json

@@ -3,7 +3,7 @@
 	"description": "The Kirby core",
 	"license": "proprietary",
 	"type": "kirby-cms",
-	"version": "4.2.0",
+	"version": "4.3.0",
 	"keywords": [
 		"kirby",
 		"cms",
@@ -37,7 +37,7 @@
 		"ext-mbstring": "*",
 		"ext-openssl": "*",
 		"christian-riesen/base32": "1.6.0",
-		"claviska/simpleimage": "4.1.0",
+		"claviska/simpleimage": "4.2.0",
 		"composer/semver": "3.4.0",
 		"filp/whoops": "2.15.4",
 		"getkirby/composer-installer": "^1.2.1",
@@ -46,7 +46,7 @@
 		"phpmailer/phpmailer": "6.9.1",
 		"symfony/polyfill-intl-idn": "1.29.0",
 		"symfony/polyfill-mbstring": "1.29.0",
-		"symfony/yaml": "6.4.3"
+		"symfony/yaml": "6.4.8"
 	},
 	"replace": {
 		"symfony/polyfill-php72": "*"

config/areas/site/searches.php

@@ -22,7 +22,7 @@
 					'text' => Escape::html($page->title()->value()),
 					'link' => $page->panel()->url(true),
 					'info' => Escape::html($page->id()),
-					'uuid' => $page->uuid()->toString(),
+					'uuid' => $page->uuid()?->toString(),
 				]),
 				'pagination' => $pages->pagination()->toArray()
 			];

config/areas/system/views.php

@@ -85,6 +85,7 @@
 				'props'     => [
 					'environment' => $environment,
 					'exceptions'  => $kirby->option('debug') === true ? $exceptions : [],
+					'info'        => $system->info(),
 					'plugins'     => $plugins,
 					'security'    => $security,
 					'urls'        => [

config/presets/page.php

@@ -44,7 +44,7 @@
 	}
 
 	if (empty($sidebar) === true) {
-		$props['fields'] = $props['fields'] ?? [];
+		$props['fields'] ??= [];
 
 		unset(
 			$props['files'],

config/presets/pages.php

@@ -26,7 +26,7 @@
 
 		// inject the global templates definition
 		if (empty($templates) === false) {
-			$props['templates'] = $props['templates'] ?? $templates;
+			$props['templates'] ??= $templates;
 		}
 
 		return array_replace_recursive($defaults, $props);

config/sections/pages.php

@@ -232,11 +232,39 @@
 				return false;
 			}
 
-			if (in_array($this->status, ['draft', 'all']) === false) {
+			if ($this->isFull() === true) {
 				return false;
 			}
 
-			if ($this->isFull() === true) {
+			// form here on, we need to check with which status
+			// the pages are created and if the section can show
+			// these newly created pages
+
+			// if the section shows pages no matter what status they have,
+			// we can always show the add button
+			if ($this->status === 'all') {
+				return true;
+			}
+
+			// collect all statuses of the blueprints
+			// that are allowed to be created
+			$statuses = [];
+
+			foreach ($this->blueprintNames() as $blueprint) {
+				try {
+					$props      = Blueprint::load('pages/' . $blueprint);
+					$statuses[] = $props['create']['status'] ?? 'draft';
+				} catch (Throwable) {
+					$statuses[] = 'draft'; // @codeCoverageIgnore
+				}
+			}
+
+			$statuses = array_unique($statuses);
+
+			// if there are multiple statuses or if the section is showing
+			// a different status than new pages would be created with,
+			// we cannot show the add button
+			if (count($statuses) > 1 || $this->status !== $statuses[0]) {
 				return false;
 			}
 
@@ -249,37 +277,41 @@
 	'methods' => [
 		'blueprints' => function () {
 			$blueprints = [];
-			$templates  = empty($this->create) === false ? A::wrap($this->create) : $this->templates;
-
-			if (empty($templates) === true) {
-				$templates = $this->kirby()->blueprints();
-			}
-
-			// excludes ignored templates
-			if ($templatesIgnore = $this->templatesIgnore) {
-				$templates = array_diff($templates, $templatesIgnore);
-			}
 
 			// convert every template to a usable option array
 			// for the template select box
-			foreach ($templates as $template) {
+			foreach ($this->blueprintNames() as $blueprint) {
 				try {
-					$props = Blueprint::load('pages/' . $template);
+					$props = Blueprint::load('pages/' . $blueprint);
 
 					$blueprints[] = [
 						'name'  => basename($props['name']),
 						'title' => $props['title'],
 					];
 				} catch (Throwable) {
 					$blueprints[] = [
-						'name'  => basename($template),
-						'title' => ucfirst($template),
+						'name'  => basename($blueprint),
+						'title' => ucfirst($blueprint),
 					];
 				}
 			}
 
 			return $blueprints;
-		}
+		},
+		'blueprintNames' => function () {
+			$blueprints  = empty($this->create) === false ? A::wrap($this->create) : $this->templates;
+
+			if (empty($blueprints) === true) {
+				$blueprints = $this->kirby()->blueprints();
+			}
+
+			// excludes ignored templates
+			if ($templatesIgnore = $this->templatesIgnore) {
+				$blueprints = array_diff($blueprints, $templatesIgnore);
+			}
+
+			return $blueprints;
+		},
 	],
 	'toArray' => function () {
 		return [

config/tags.php

@@ -252,6 +252,7 @@
 			'caption',
 			'controls',
 			'class',
+			'disablepictureinpicture',
 			'height',
 			'loop',
 			'muted',
@@ -294,12 +295,15 @@
 
 			// don't use attributes that iframe doesn't support
 			if ($isProviderVideo === false) {
-				// converts tag attributes to supported formats (listed below) to output correct html
-				// booleans: autoplay, controls, loop, muted
-				// strings : poster, preload
-				// for ex  : `autoplay` will not work if `false` is a `string` instead of a `boolean`
+				// convert tag attributes to supported formats (bool, string)
+				// to output correct html attributes
+				//
+				// for ex:
+				// `autoplay` will not work if `false` is a string
+				// instead of a boolean
 				$attrs['autoplay']    = $autoplay = Str::toType($tag->autoplay, 'bool');
 				$attrs['controls']    = Str::toType($tag->controls ?? true, 'bool');
+				$attrs['disablepictureinpicture'] = Str::toType($tag->disablepictureinpicture ?? false, 'bool');
 				$attrs['loop']        = Str::toType($tag->loop, 'bool');
 				$attrs['muted']       = Str::toType($tag->muted ?? $autoplay, 'bool');
 				$attrs['playsinline'] = Str::toType($tag->playsinline ?? $autoplay, 'bool');