+ */
+ private function getBlockWrapper( string $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ $originalWrapperClassname = ( new Dom_Document_Helper( $blockContent ) )->getAttributeValueByTagName( 'div', 'class' ) ?? '';
+ $block_attributes = wp_parse_args(
+ $parsedBlock['attrs'] ?? array(),
+ array(
+ 'verticalAlignment' => 'stretch',
+ 'width' => $settingsController->getLayoutWidthWithoutPadding(),
+ 'style' => array(),
+ )
+ );
- // The default column alignment is `stretch to fill` which means that we need to set the background color to the main cell
- // to create a feeling of a stretched column. This also needs to apply to CSS classnames which can also apply styles.
- $isStretched = empty($block_attributes['verticalAlignment']) || $block_attributes['verticalAlignment'] === 'stretch';
+ // The default column alignment is `stretch to fill` which means that we need to set the background color to the main cell
+ // to create a feeling of a stretched column. This also needs to apply to CSS classnames which can also apply styles.
+ $isStretched = empty( $block_attributes['verticalAlignment'] ) || $block_attributes['verticalAlignment'] === 'stretch';
- $paddingCSS = $this->getStylesFromBlock(['spacing' => ['padding' => $block_attributes['style']['spacing']['padding'] ?? []]])['css'];
- $cellStyles = $this->getStylesFromBlock([
- 'color' => $block_attributes['style']['color'] ?? [],
- 'background' => $block_attributes['style']['background'] ?? [],
- ])['declarations'];
+ $paddingCSS = $this->getStylesFromBlock( array( 'spacing' => array( 'padding' => $block_attributes['style']['spacing']['padding'] ?? array() ) ) )['css'];
+ $cellStyles = $this->getStylesFromBlock(
+ array(
+ 'color' => $block_attributes['style']['color'] ?? array(),
+ 'background' => $block_attributes['style']['background'] ?? array(),
+ )
+ )['declarations'];
- $borderStyles = $this->getStylesFromBlock(['border' => $block_attributes['style']['border'] ?? []])['declarations'];
+ $borderStyles = $this->getStylesFromBlock( array( 'border' => $block_attributes['style']['border'] ?? array() ) )['declarations'];
- if (!empty($borderStyles)) {
- $cellStyles = array_merge($cellStyles, ['border-style' => 'solid'], $borderStyles);
- }
+ if ( ! empty( $borderStyles ) ) {
+ $cellStyles = array_merge( $cellStyles, array( 'border-style' => 'solid' ), $borderStyles );
+ }
- if (!empty($cellStyles['background-image']) && empty($cellStyles['background-size'])) {
- $cellStyles['background-size'] = 'cover';
- }
+ if ( ! empty( $cellStyles['background-image'] ) && empty( $cellStyles['background-size'] ) ) {
+ $cellStyles['background-size'] = 'cover';
+ }
- $wrapperClassname = 'block wp-block-column email-block-column';
- $contentClassname = 'email-block-column-content';
- $wrapperCSS = WP_Style_Engine::compile_css([
- 'vertical-align' => $isStretched ? 'top' : $block_attributes['verticalAlignment'],
- ], '');
- $contentCSS = 'vertical-align: top;';
+ $wrapperClassname = 'block wp-block-column email-block-column';
+ $contentClassname = 'email-block-column-content';
+ $wrapperCSS = WP_Style_Engine::compile_css(
+ array(
+ 'vertical-align' => $isStretched ? 'top' : $block_attributes['verticalAlignment'],
+ ),
+ ''
+ );
+ $contentCSS = 'vertical-align: top;';
- if ($isStretched) {
- $wrapperClassname .= ' ' . $originalWrapperClassname;
- $wrapperCSS .= ' ' . WP_Style_Engine::compile_css($cellStyles, '');
- } else {
- $contentClassname .= ' ' . $originalWrapperClassname;
- $contentCSS .= ' ' . WP_Style_Engine::compile_css($cellStyles, '');
- }
+ if ( $isStretched ) {
+ $wrapperClassname .= ' ' . $originalWrapperClassname;
+ $wrapperCSS .= ' ' . WP_Style_Engine::compile_css( $cellStyles, '' );
+ } else {
+ $contentClassname .= ' ' . $originalWrapperClassname;
+ $contentCSS .= ' ' . WP_Style_Engine::compile_css( $cellStyles, '' );
+ }
- return '
-
-
+ return '
+
+
- |
+ |
{column_content}
|
@@ -87,5 +95,5 @@ class Column extends Abstract_Block_Renderer {
|
';
- }
+ }
}
diff --git a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-columns.php b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-columns.php
index d009194b5c..fd21160ea8 100644
--- a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-columns.php
+++ b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-columns.php
@@ -8,68 +8,75 @@ use MailPoet\EmailEditor\Integrations\Utils\Dom_Document_Helper;
use WP_Style_Engine;
class Columns extends Abstract_Block_Renderer {
- protected function renderContent(string $blockContent, array $parsedBlock, Settings_Controller $settingsController): string {
- $content = '';
- foreach ($parsedBlock['innerBlocks'] ?? [] as $block) {
- $content .= render_block($block);
- }
+ protected function renderContent( string $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ $content = '';
+ foreach ( $parsedBlock['innerBlocks'] ?? array() as $block ) {
+ $content .= render_block( $block );
+ }
- return str_replace(
- '{columns_content}',
- $content,
- $this->getBlockWrapper($blockContent, $parsedBlock, $settingsController)
- );
- }
+ return str_replace(
+ '{columns_content}',
+ $content,
+ $this->getBlockWrapper( $blockContent, $parsedBlock, $settingsController )
+ );
+ }
- /**
- * Based on MJML
- */
- private function getBlockWrapper(string $blockContent, array $parsedBlock, Settings_Controller $settingsController): string {
- $originalWrapperClassname = (new Dom_Document_Helper($blockContent))->getAttributeValueByTagName('div', 'class') ?? '';
- $block_attributes = wp_parse_args($parsedBlock['attrs'] ?? [], [
- 'align' => null,
- 'width' => $settingsController->getLayoutWidthWithoutPadding(),
- 'style' => [],
- ]);
+ /**
+ * Based on MJML
+ */
+ private function getBlockWrapper( string $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ $originalWrapperClassname = ( new Dom_Document_Helper( $blockContent ) )->getAttributeValueByTagName( 'div', 'class' ) ?? '';
+ $block_attributes = wp_parse_args(
+ $parsedBlock['attrs'] ?? array(),
+ array(
+ 'align' => null,
+ 'width' => $settingsController->getLayoutWidthWithoutPadding(),
+ 'style' => array(),
+ )
+ );
- $columnsStyles = $this->getStylesFromBlock([
- 'spacing' => [ 'padding' => $block_attributes['style']['spacing']['padding'] ?? [] ],
- 'color' => $block_attributes['style']['color'] ?? [],
- 'background' => $block_attributes['style']['background'] ?? [],
- ])['declarations'];
+ $columnsStyles = $this->getStylesFromBlock(
+ array(
+ 'spacing' => array( 'padding' => $block_attributes['style']['spacing']['padding'] ?? array() ),
+ 'color' => $block_attributes['style']['color'] ?? array(),
+ 'background' => $block_attributes['style']['background'] ?? array(),
+ )
+ )['declarations'];
- $borderStyles = $this->getStylesFromBlock(['border' => $block_attributes['style']['border'] ?? []])['declarations'];
+ $borderStyles = $this->getStylesFromBlock( array( 'border' => $block_attributes['style']['border'] ?? array() ) )['declarations'];
- if (!empty($borderStyles)) {
- $columnsStyles = array_merge($columnsStyles, ['border-style' => 'solid'], $borderStyles);
- }
+ if ( ! empty( $borderStyles ) ) {
+ $columnsStyles = array_merge( $columnsStyles, array( 'border-style' => 'solid' ), $borderStyles );
+ }
- if (empty($columnsStyles['background-size'])) {
- $columnsStyles['background-size'] = 'cover';
- }
+ if ( empty( $columnsStyles['background-size'] ) ) {
+ $columnsStyles['background-size'] = 'cover';
+ }
- $renderedColumns = '
+ $renderedColumns = '';
- // Margins are not supported well in outlook for tables, so wrap in another table.
- $margins = $block_attributes['style']['spacing']['margin'] ?? [];
+ // Margins are not supported well in outlook for tables, so wrap in another table.
+ $margins = $block_attributes['style']['spacing']['margin'] ?? array();
- if (!empty($margins)) {
- $marginToPaddingStyles = $this->getStylesFromBlock([
- 'spacing' => [ 'margin' => $margins ],
- ])['css'];
- $renderedColumns = '
+ if ( ! empty( $margins ) ) {
+ $marginToPaddingStyles = $this->getStylesFromBlock(
+ array(
+ 'spacing' => array( 'margin' => $margins ),
+ )
+ )['css'];
+ $renderedColumns = '';
- }
+ }
- return $renderedColumns;
- }
+ return $renderedColumns;
+ }
}
diff --git a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-fallback.php b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-fallback.php
index ea8447dfeb..96dcb639f6 100644
--- a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-fallback.php
+++ b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-fallback.php
@@ -14,7 +14,7 @@ use MailPoet\EmailEditor\Engine\Settings_Controller;
* We need to find a better abstraction/architecture for this.
*/
class Fallback extends Abstract_Block_Renderer {
- protected function renderContent($blockContent, array $parsedBlock, Settings_Controller $settingsController): string {
- return $blockContent;
- }
+ protected function renderContent( $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ return $blockContent;
+ }
}
diff --git a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-group.php b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-group.php
index 7d33b2021a..499d64234e 100644
--- a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-group.php
+++ b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-group.php
@@ -8,55 +8,64 @@ use MailPoet\EmailEditor\Integrations\Utils\Dom_Document_Helper;
use WP_Style_Engine;
class Group extends Abstract_Block_Renderer {
- protected function renderContent(string $blockContent, array $parsedBlock, Settings_Controller $settingsController): string {
- $content = '';
- $innerBlocks = $parsedBlock['innerBlocks'] ?? [];
+ protected function renderContent( string $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ $content = '';
+ $innerBlocks = $parsedBlock['innerBlocks'] ?? array();
- foreach ($innerBlocks as $block) {
- $content .= render_block($block);
- }
+ foreach ( $innerBlocks as $block ) {
+ $content .= render_block( $block );
+ }
- return str_replace(
- '{group_content}',
- $content,
- $this->getBlockWrapper($blockContent, $parsedBlock, $settingsController)
- );
- }
+ return str_replace(
+ '{group_content}',
+ $content,
+ $this->getBlockWrapper( $blockContent, $parsedBlock, $settingsController )
+ );
+ }
- private function getBlockWrapper(string $blockContent, array $parsedBlock, Settings_Controller $settingsController): string {
- $originalClassname = (new Dom_Document_Helper($blockContent))->getAttributeValueByTagName('div', 'class') ?? '';
- $blockAttributes = wp_parse_args($parsedBlock['attrs'] ?? [], [
- 'style' => [],
- 'backgroundColor' => '',
- 'textColor' => '',
- 'borderColor' => '',
- 'layout' => [],
- ]);
+ private function getBlockWrapper( string $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ $originalClassname = ( new Dom_Document_Helper( $blockContent ) )->getAttributeValueByTagName( 'div', 'class' ) ?? '';
+ $blockAttributes = wp_parse_args(
+ $parsedBlock['attrs'] ?? array(),
+ array(
+ 'style' => array(),
+ 'backgroundColor' => '',
+ 'textColor' => '',
+ 'borderColor' => '',
+ 'layout' => array(),
+ )
+ );
- // Layout, background, borders need to be on the outer table element.
- $tableStyles = $this->getStylesFromBlock([
- 'color' => array_filter([
- 'background' => $blockAttributes['backgroundColor'] ? $settingsController->translateSlugToColor($blockAttributes['backgroundColor']) : null,
- 'text' => $blockAttributes['textColor'] ? $settingsController->translateSlugToColor($blockAttributes['textColor']) : null,
- 'border' => $blockAttributes['borderColor'] ? $settingsController->translateSlugToColor($blockAttributes['borderColor']) : null,
- ]),
- 'background' => $blockAttributes['style']['background'] ?? [],
- 'border' => $blockAttributes['style']['border'] ?? [],
- 'spacing' => [ 'padding' => $blockAttributes['style']['spacing']['margin'] ?? [] ],
- ])['declarations'];
- $tableStyles['border-collapse'] = 'separate'; // Needed for the border radius to work.
+ // Layout, background, borders need to be on the outer table element.
+ $tableStyles = $this->getStylesFromBlock(
+ array(
+ 'color' => array_filter(
+ array(
+ 'background' => $blockAttributes['backgroundColor'] ? $settingsController->translateSlugToColor( $blockAttributes['backgroundColor'] ) : null,
+ 'text' => $blockAttributes['textColor'] ? $settingsController->translateSlugToColor( $blockAttributes['textColor'] ) : null,
+ 'border' => $blockAttributes['borderColor'] ? $settingsController->translateSlugToColor( $blockAttributes['borderColor'] ) : null,
+ )
+ ),
+ 'background' => $blockAttributes['style']['background'] ?? array(),
+ 'border' => $blockAttributes['style']['border'] ?? array(),
+ 'spacing' => array( 'padding' => $blockAttributes['style']['spacing']['margin'] ?? array() ),
+ )
+ )['declarations'];
+ $tableStyles['border-collapse'] = 'separate'; // Needed for the border radius to work.
- // Padding properties need to be added to the table cell.
- $cellStyles = $this->getStylesFromBlock([
- 'spacing' => [ 'padding' => $blockAttributes['style']['spacing']['padding'] ?? [] ],
- ])['declarations'];
+ // Padding properties need to be added to the table cell.
+ $cellStyles = $this->getStylesFromBlock(
+ array(
+ 'spacing' => array( 'padding' => $blockAttributes['style']['spacing']['padding'] ?? array() ),
+ )
+ )['declarations'];
- $tableStyles['background-size'] = empty($tableStyles['background-size']) ? 'cover' : $tableStyles['background-size'];
- $justifyContent = $blockAttributes['layout']['justifyContent'] ?? 'center';
- $width = $parsedBlock['email_attrs']['width'] ?? '100%';
+ $tableStyles['background-size'] = empty( $tableStyles['background-size'] ) ? 'cover' : $tableStyles['background-size'];
+ $justifyContent = $blockAttributes['layout']['justifyContent'] ?? 'center';
+ $width = $parsedBlock['email_attrs']['width'] ?? '100%';
- return sprintf(
- '
+ return sprintf(
+ '
|
@@ -65,11 +74,11 @@ class Group extends Abstract_Block_Renderer {
|
',
- esc_attr(WP_Style_Engine::compile_css($tableStyles, '')),
- esc_attr(WP_Style_Engine::compile_css($cellStyles, '')),
- esc_attr($originalClassname),
- esc_attr($justifyContent),
- esc_attr($width),
- );
- }
+ esc_attr( WP_Style_Engine::compile_css( $tableStyles, '' ) ),
+ esc_attr( WP_Style_Engine::compile_css( $cellStyles, '' ) ),
+ esc_attr( $originalClassname ),
+ esc_attr( $justifyContent ),
+ esc_attr( $width ),
+ );
+ }
}
diff --git a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-image.php b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-image.php
index aed5b189a8..14096ae350 100644
--- a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-image.php
+++ b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-image.php
@@ -6,190 +6,209 @@ use MailPoet\EmailEditor\Engine\Settings_Controller;
use MailPoet\EmailEditor\Integrations\Utils\Dom_Document_Helper;
class Image extends Abstract_Block_Renderer {
- protected function renderContent($blockContent, array $parsedBlock, Settings_Controller $settingsController): string {
- $parsedHtml = $this->parseBlockContent($blockContent);
+ protected function renderContent( $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ $parsedHtml = $this->parseBlockContent( $blockContent );
- if (!$parsedHtml) {
- return '';
- }
+ if ( ! $parsedHtml ) {
+ return '';
+ }
- $imageUrl = $parsedHtml['imageUrl'];
- $image = $parsedHtml['image'];
- $caption = $parsedHtml['caption'];
- $class = $parsedHtml['class'];
- $parsedBlock = $this->addImageSizeWhenMissing($parsedBlock, $imageUrl, $settingsController);
- $image = $this->addImageDimensions($image, $parsedBlock, $settingsController);
+ $imageUrl = $parsedHtml['imageUrl'];
+ $image = $parsedHtml['image'];
+ $caption = $parsedHtml['caption'];
+ $class = $parsedHtml['class'];
+ $parsedBlock = $this->addImageSizeWhenMissing( $parsedBlock, $imageUrl, $settingsController );
+ $image = $this->addImageDimensions( $image, $parsedBlock, $settingsController );
- $imageWithWrapper = str_replace(
- ['{image_content}', '{caption_content}'],
- [$image, $caption],
- $this->getBlockWrapper($parsedBlock, $settingsController, $caption)
- );
+ $imageWithWrapper = str_replace(
+ array( '{image_content}', '{caption_content}' ),
+ array( $image, $caption ),
+ $this->getBlockWrapper( $parsedBlock, $settingsController, $caption )
+ );
- $imageWithWrapper = $this->applyRoundedStyle($imageWithWrapper, $parsedBlock);
- $imageWithWrapper = $this->applyImageBorderStyle($imageWithWrapper, $parsedBlock, $class);
- return $imageWithWrapper;
- }
+ $imageWithWrapper = $this->applyRoundedStyle( $imageWithWrapper, $parsedBlock );
+ $imageWithWrapper = $this->applyImageBorderStyle( $imageWithWrapper, $parsedBlock, $class );
+ return $imageWithWrapper;
+ }
- private function applyRoundedStyle(string $blockContent, array $parsedBlock): string {
- // Because the isn't an attribute for definition of rounded style, we have to check the class name
- if (isset($parsedBlock['attrs']['className']) && strpos($parsedBlock['attrs']['className'], 'is-style-rounded') !== false) {
- // If the image should be in a circle, we need to set the border-radius to 9999px to make it the same as is in the editor
- // This style is applied to both wrapper and the image
- $blockContent = $this->removeStyleAttributeFromElement($blockContent, ['tag_name' => 'td', 'class_name' => 'email-image-cell'], 'border-radius');
- $blockContent = $this->addStyleToElement($blockContent, ['tag_name' => 'td', 'class_name' => 'email-image-cell'], 'border-radius: 9999px;');
- $blockContent = $this->removeStyleAttributeFromElement($blockContent, ['tag_name' => 'img'], 'border-radius');
- $blockContent = $this->addStyleToElement($blockContent, ['tag_name' => 'img'], 'border-radius: 9999px;');
- }
- return $blockContent;
- }
+ private function applyRoundedStyle( string $blockContent, array $parsedBlock ): string {
+ // Because the isn't an attribute for definition of rounded style, we have to check the class name
+ if ( isset( $parsedBlock['attrs']['className'] ) && strpos( $parsedBlock['attrs']['className'], 'is-style-rounded' ) !== false ) {
+ // If the image should be in a circle, we need to set the border-radius to 9999px to make it the same as is in the editor
+ // This style is applied to both wrapper and the image
+ $blockContent = $this->removeStyleAttributeFromElement(
+ $blockContent,
+ array(
+ 'tag_name' => 'td',
+ 'class_name' => 'email-image-cell',
+ ),
+ 'border-radius'
+ );
+ $blockContent = $this->addStyleToElement(
+ $blockContent,
+ array(
+ 'tag_name' => 'td',
+ 'class_name' => 'email-image-cell',
+ ),
+ 'border-radius: 9999px;'
+ );
+ $blockContent = $this->removeStyleAttributeFromElement( $blockContent, array( 'tag_name' => 'img' ), 'border-radius' );
+ $blockContent = $this->addStyleToElement( $blockContent, array( 'tag_name' => 'img' ), 'border-radius: 9999px;' );
+ }
+ return $blockContent;
+ }
- /**
- * When the width is not set, it's important to get it for the image to be displayed correctly
- */
- private function addImageSizeWhenMissing(array $parsedBlock, string $imageUrl, Settings_Controller $settingsController): array {
- if (isset($parsedBlock['attrs']['width'])) {
- return $parsedBlock;
- }
- // Can't determine any width let's go with 100%
- if (!isset($parsedBlock['email_attrs']['width'])) {
- $parsedBlock['attrs']['width'] = '100%';
- }
- $maxWidth = $settingsController->parseNumberFromStringWithPixels($parsedBlock['email_attrs']['width']);
- $imageSize = wp_getimagesize($imageUrl);
- $imageSize = $imageSize ? $imageSize[0] : $maxWidth;
- $width = min($imageSize, $maxWidth);
- $parsedBlock['attrs']['width'] = "{$width}px";
- return $parsedBlock;
+ /**
+ * When the width is not set, it's important to get it for the image to be displayed correctly
+ */
+ private function addImageSizeWhenMissing( array $parsedBlock, string $imageUrl, Settings_Controller $settingsController ): array {
+ if ( isset( $parsedBlock['attrs']['width'] ) ) {
+ return $parsedBlock;
+ }
+ // Can't determine any width let's go with 100%
+ if ( ! isset( $parsedBlock['email_attrs']['width'] ) ) {
+ $parsedBlock['attrs']['width'] = '100%';
+ }
+ $maxWidth = $settingsController->parseNumberFromStringWithPixels( $parsedBlock['email_attrs']['width'] );
+ $imageSize = wp_getimagesize( $imageUrl );
+ $imageSize = $imageSize ? $imageSize[0] : $maxWidth;
+ $width = min( $imageSize, $maxWidth );
+ $parsedBlock['attrs']['width'] = "{$width}px";
+ return $parsedBlock;
+ }
- }
+ private function applyImageBorderStyle( string $blockContent, array $parsedBlock, string $class ): string {
+ // Getting individual border properties
+ $borderStyles = wp_style_engine_get_styles( array( 'border' => $parsedBlock['attrs']['style']['border'] ?? array() ) );
+ $borderStyles = $borderStyles['declarations'] ?? array();
+ if ( ! empty( $borderStyles ) ) {
+ $borderStyles['border-style'] = 'solid';
+ $borderStyles['box-sizing'] = 'border-box';
+ }
+ $borderElementTag = array(
+ 'tag_name' => 'td',
+ 'class_name' => 'email-image-cell',
+ );
+ $contentWithBorderStyles = $this->addStyleToElement( $blockContent, $borderElementTag, \WP_Style_Engine::compile_css( $borderStyles, '' ) );
+ // Add Border related classes to proper element. This is required for inlined border-color styles when defined via class
+ $borderClasses = array_filter(
+ explode( ' ', $class ),
+ function ( $className ) {
+ return strpos( $className, 'border' ) !== false;
+ }
+ );
+ $html = new \WP_HTML_Tag_Processor( $contentWithBorderStyles );
+ if ( $html->next_tag( $borderElementTag ) ) {
+ $class = $html->get_attribute( 'class' ) ?? '';
+ $borderClasses[] = $class;
+ $html->set_attribute( 'class', implode( ' ', $borderClasses ) );
+ }
+ return $html->get_updated_html();
+ }
- private function applyImageBorderStyle(string $blockContent, array $parsedBlock, string $class): string {
- // Getting individual border properties
- $borderStyles = wp_style_engine_get_styles(['border' => $parsedBlock['attrs']['style']['border'] ?? []]);
- $borderStyles = $borderStyles['declarations'] ?? [];
- if (!empty($borderStyles)) {
- $borderStyles['border-style'] = 'solid';
- $borderStyles['box-sizing'] = 'border-box';
- }
- $borderElementTag = ['tag_name' => 'td', 'class_name' => 'email-image-cell'];
- $contentWithBorderStyles = $this->addStyleToElement($blockContent, $borderElementTag, \WP_Style_Engine::compile_css($borderStyles, ''));
- // Add Border related classes to proper element. This is required for inlined border-color styles when defined via class
- $borderClasses = array_filter(explode(' ', $class), function($className) {
- return strpos($className, 'border') !== false;
- });
- $html = new \WP_HTML_Tag_Processor($contentWithBorderStyles);
- if ($html->next_tag($borderElementTag)) {
- $class = $html->get_attribute('class') ?? '';
- $borderClasses[] = $class;
- $html->set_attribute('class', implode(' ', $borderClasses));
- }
- return $html->get_updated_html();
- }
+ /**
+ * Settings width and height attributes for images is important for MS Outlook.
+ */
+ private function addImageDimensions( $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ $html = new \WP_HTML_Tag_Processor( $blockContent );
+ if ( $html->next_tag( array( 'tag_name' => 'img' ) ) ) {
+ // Getting height from styles and if it's set, we set the height attribute
+ $styles = $html->get_attribute( 'style' ) ?? '';
+ $styles = $settingsController->parseStylesToArray( $styles );
+ $height = $styles['height'] ?? null;
+ if ( $height && $height !== 'auto' && is_numeric( $settingsController->parseNumberFromStringWithPixels( $height ) ) ) {
+ $height = $settingsController->parseNumberFromStringWithPixels( $height );
+ $html->set_attribute( 'height', esc_attr( $height ) );
+ }
- /**
- * Settings width and height attributes for images is important for MS Outlook.
- */
- private function addImageDimensions($blockContent, array $parsedBlock, Settings_Controller $settingsController): string {
- $html = new \WP_HTML_Tag_Processor($blockContent);
- if ($html->next_tag(['tag_name' => 'img'])) {
- // Getting height from styles and if it's set, we set the height attribute
- $styles = $html->get_attribute('style') ?? '';
- $styles = $settingsController->parseStylesToArray($styles);
- $height = $styles['height'] ?? null;
- if ($height && $height !== 'auto' && is_numeric($settingsController->parseNumberFromStringWithPixels($height))) {
- $height = $settingsController->parseNumberFromStringWithPixels($height);
- $html->set_attribute('height', esc_attr($height));
- }
+ if ( isset( $parsedBlock['attrs']['width'] ) ) {
+ $width = $settingsController->parseNumberFromStringWithPixels( $parsedBlock['attrs']['width'] );
+ $html->set_attribute( 'width', esc_attr( $width ) );
+ }
+ $blockContent = $html->get_updated_html();
+ }
- if (isset($parsedBlock['attrs']['width'])) {
- $width = $settingsController->parseNumberFromStringWithPixels($parsedBlock['attrs']['width']);
- $html->set_attribute('width', esc_attr($width));
- }
- $blockContent = $html->get_updated_html();
- }
+ return $blockContent;
+ }
- return $blockContent;
- }
+ /**
+ * This method configure the font size of the caption because it's set to 0 for the parent element to avoid unexpected white spaces
+ * We try to use font-size passed down from the parent element $parsedBlock['email_attrs']['font-size'], but if it's not set, we use the default font-size from the email theme.
+ */
+ private function getCaptionStyles( Settings_Controller $settingsController, array $parsedBlock ): string {
+ $themeData = $settingsController->getTheme()->get_data();
- /**
- * This method configure the font size of the caption because it's set to 0 for the parent element to avoid unexpected white spaces
- * We try to use font-size passed down from the parent element $parsedBlock['email_attrs']['font-size'], but if it's not set, we use the default font-size from the email theme.
- */
- private function getCaptionStyles(Settings_Controller $settingsController, array $parsedBlock): string {
- $themeData = $settingsController->getTheme()->get_data();
+ $styles = array(
+ 'text-align' => isset( $parsedBlock['attrs']['align'] ) ? 'center' : 'left',
+ );
- $styles = [
- 'text-align' => isset($parsedBlock['attrs']['align']) ? 'center' : 'left',
- ];
+ $styles['font-size'] = $parsedBlock['email_attrs']['font-size'] ?? $themeData['styles']['typography']['fontSize'];
+ return \WP_Style_Engine::compile_css( $styles, '' );
+ }
- $styles['font-size'] = $parsedBlock['email_attrs']['font-size'] ?? $themeData['styles']['typography']['fontSize'];
- return \WP_Style_Engine::compile_css($styles, '');
- }
+ /**
+ * Based on MJML but because MJML doesn't support captions, our solution is a bit different
+ */
+ private function getBlockWrapper( array $parsedBlock, Settings_Controller $settingsController, ?string $caption ): string {
+ $styles = array(
+ 'border-collapse' => 'collapse',
+ 'border-spacing' => '0px',
+ 'font-size' => '0px',
+ 'vertical-align' => 'top',
+ 'width' => '100%',
+ );
- /**
- * Based on MJML but because MJML doesn't support captions, our solution is a bit different
- */
- private function getBlockWrapper(array $parsedBlock, Settings_Controller $settingsController, ?string $caption): string {
- $styles = [
- 'border-collapse' => 'collapse',
- 'border-spacing' => '0px',
- 'font-size' => '0px',
- 'vertical-align' => 'top',
- 'width' => '100%',
- ];
+ $width = $parsedBlock['attrs']['width'] ?? '100%';
+ $wrapperWidth = ( $width && $width !== '100%' ) ? $width : 'auto';
+ $wrapperStyles = $styles;
+ $wrapperStyles['width'] = $wrapperWidth;
+ $wrapperStyles['border-collapse'] = 'separate'; // Needed because of border radius
- $width = $parsedBlock['attrs']['width'] ?? '100%';
- $wrapperWidth = ($width && $width !== '100%') ? $width : 'auto';
- $wrapperStyles = $styles;
- $wrapperStyles['width'] = $wrapperWidth;
- $wrapperStyles['border-collapse'] = 'separate'; // Needed because of border radius
-
- $captionHtml = '';
- if ($caption) {
- // When the image is not aligned, the wrapper is set to 100% width due to caption that can be longer than the image
- $captionWidth = isset($parsedBlock['attrs']['align']) ? ($parsedBlock['attrs']['width'] ?? '100%') : '100%';
- $captionWrapperStyles = $styles;
- $captionWrapperStyles['width'] = $captionWidth;
- $captionStyles = $this->getCaptionStyles($settingsController, $parsedBlock);
- $captionHtml = '
+ $captionHtml = '';
+ if ( $caption ) {
+ // When the image is not aligned, the wrapper is set to 100% width due to caption that can be longer than the image
+ $captionWidth = isset( $parsedBlock['attrs']['align'] ) ? ( $parsedBlock['attrs']['width'] ?? '100%' ) : '100%';
+ $captionWrapperStyles = $styles;
+ $captionWrapperStyles['width'] = $captionWidth;
+ $captionStyles = $this->getCaptionStyles( $settingsController, $parsedBlock );
+ $captionHtml = '
- | {caption_content} |
+ {caption_content} |
';
- }
+ }
- $styles['width'] = '100%';
- $align = $parsedBlock['attrs']['align'] ?? 'left';
+ $styles['width'] = '100%';
+ $align = $parsedBlock['attrs']['align'] ?? 'left';
- return '
+ return '
- |
+ |
| {image_content} |
@@ -199,83 +218,83 @@ class Image extends Abstract_Block_Renderer {
';
- }
+ }
- /**
- * @param array{tag_name: string, class_name?: string} $tag
- * @param string $style
- */
- private function addStyleToElement($blockContent, array $tag, string $style): string {
- $html = new \WP_HTML_Tag_Processor($blockContent);
- if ($html->next_tag($tag)) {
- $elementStyle = $html->get_attribute('style') ?? '';
- $elementStyle = !empty($elementStyle) ? (rtrim($elementStyle, ';') . ';') : ''; // Adding semicolon if it's missing
- $elementStyle .= $style;
- $html->set_attribute('style', esc_attr($elementStyle));
- $blockContent = $html->get_updated_html();
- }
+ /**
+ * @param array{tag_name: string, class_name?: string} $tag
+ * @param string $style
+ */
+ private function addStyleToElement( $blockContent, array $tag, string $style ): string {
+ $html = new \WP_HTML_Tag_Processor( $blockContent );
+ if ( $html->next_tag( $tag ) ) {
+ $elementStyle = $html->get_attribute( 'style' ) ?? '';
+ $elementStyle = ! empty( $elementStyle ) ? ( rtrim( $elementStyle, ';' ) . ';' ) : ''; // Adding semicolon if it's missing
+ $elementStyle .= $style;
+ $html->set_attribute( 'style', esc_attr( $elementStyle ) );
+ $blockContent = $html->get_updated_html();
+ }
- return $blockContent;
- }
+ return $blockContent;
+ }
- /**
- * @param array{tag_name: string, class_name?: string} $tag
- */
- private function removeStyleAttributeFromElement($blockContent, array $tag, string $styleName): string {
- $html = new \WP_HTML_Tag_Processor($blockContent);
- if ($html->next_tag($tag)) {
- $elementStyle = $html->get_attribute('style') ?? '';
- $elementStyle = preg_replace('/' . $styleName . ':(.?[0-9]+px)+;?/', '', $elementStyle);
- $html->set_attribute('style', esc_attr($elementStyle));
- $blockContent = $html->get_updated_html();
- }
+ /**
+ * @param array{tag_name: string, class_name?: string} $tag
+ */
+ private function removeStyleAttributeFromElement( $blockContent, array $tag, string $styleName ): string {
+ $html = new \WP_HTML_Tag_Processor( $blockContent );
+ if ( $html->next_tag( $tag ) ) {
+ $elementStyle = $html->get_attribute( 'style' ) ?? '';
+ $elementStyle = preg_replace( '/' . $styleName . ':(.?[0-9]+px)+;?/', '', $elementStyle );
+ $html->set_attribute( 'style', esc_attr( $elementStyle ) );
+ $blockContent = $html->get_updated_html();
+ }
- return $blockContent;
- }
+ return $blockContent;
+ }
- /**
- * @param string $blockContent
- * @return array{imageUrl: string, image: string, caption: string}|null
- */
- private function parseBlockContent(string $blockContent): ?array {
- // If block's image is not set, we don't need to parse the content
- if (empty($blockContent)) {
- return null;
- }
+ /**
+ * @param string $blockContent
+ * @return array{imageUrl: string, image: string, caption: string}|null
+ */
+ private function parseBlockContent( string $blockContent ): ?array {
+ // If block's image is not set, we don't need to parse the content
+ if ( empty( $blockContent ) ) {
+ return null;
+ }
- $domHelper = new Dom_Document_Helper($blockContent);
+ $domHelper = new Dom_Document_Helper( $blockContent );
- $figureTag = $domHelper->findElement('figure');
- if (!$figureTag) {
- return null;
- }
+ $figureTag = $domHelper->findElement( 'figure' );
+ if ( ! $figureTag ) {
+ return null;
+ }
- $imgTag = $domHelper->findElement('img');
- if (!$imgTag) {
- return null;
- }
+ $imgTag = $domHelper->findElement( 'img' );
+ if ( ! $imgTag ) {
+ return null;
+ }
- $imageSrc = $domHelper->getAttributeValue($imgTag, 'src');
- $imageClass = $domHelper->getAttributeValue($imgTag, 'class');
- $imageHtml = $domHelper->getOuterHtml($imgTag);
- $figcaption = $domHelper->findElement('figcaption');
- $figcaptionHtml = $figcaption ? $domHelper->getOuterHtml($figcaption) : '';
- $figcaptionHtml = str_replace([''], [''], $figcaptionHtml);
+ $imageSrc = $domHelper->getAttributeValue( $imgTag, 'src' );
+ $imageClass = $domHelper->getAttributeValue( $imgTag, 'class' );
+ $imageHtml = $domHelper->getOuterHtml( $imgTag );
+ $figcaption = $domHelper->findElement( 'figcaption' );
+ $figcaptionHtml = $figcaption ? $domHelper->getOuterHtml( $figcaption ) : '';
+ $figcaptionHtml = str_replace( array( '' ), array( '' ), $figcaptionHtml );
- return [
- 'imageUrl' => $imageSrc ?: '',
- 'image' => $this->cleanupImageHtml($imageHtml),
- 'caption' => $figcaptionHtml ?: '',
- 'class' => $imageClass ?: '',
- ];
- }
+ return array(
+ 'imageUrl' => $imageSrc ?: '',
+ 'image' => $this->cleanupImageHtml( $imageHtml ),
+ 'caption' => $figcaptionHtml ?: '',
+ 'class' => $imageClass ?: '',
+ );
+ }
- private function cleanupImageHtml(string $contentHtml): string {
- $html = new \WP_HTML_Tag_Processor($contentHtml);
- if ($html->next_tag(['tag_name' => 'img'])) {
- $html->remove_attribute('srcset');
- $html->remove_attribute('class');
- }
- return $html->get_updated_html();
- }
+ private function cleanupImageHtml( string $contentHtml ): string {
+ $html = new \WP_HTML_Tag_Processor( $contentHtml );
+ if ( $html->next_tag( array( 'tag_name' => 'img' ) ) ) {
+ $html->remove_attribute( 'srcset' );
+ $html->remove_attribute( 'class' );
+ }
+ return $html->get_updated_html();
+ }
}
diff --git a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-list-block.php b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-list-block.php
index 6bb347585b..fd4c4287e8 100644
--- a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-list-block.php
+++ b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-list-block.php
@@ -6,37 +6,40 @@ use MailPoet\EmailEditor\Engine\Settings_Controller;
// We have to avoid using keyword `List`
class List_Block extends Abstract_Block_Renderer {
- protected function renderContent(string $blockContent, array $parsedBlock, Settings_Controller $settingsController): string {
- $html = new \WP_HTML_Tag_Processor($blockContent);
- $tagName = ($parsedBlock['attrs']['ordered'] ?? false) ? 'ol' : 'ul';
- if ($html->next_tag(['tag_name' => $tagName])) {
- $styles = $html->get_attribute('style') ?? '';
- $styles = $settingsController->parseStylesToArray($styles);
+ protected function renderContent( string $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ $html = new \WP_HTML_Tag_Processor( $blockContent );
+ $tagName = ( $parsedBlock['attrs']['ordered'] ?? false ) ? 'ol' : 'ul';
+ if ( $html->next_tag( array( 'tag_name' => $tagName ) ) ) {
+ $styles = $html->get_attribute( 'style' ) ?? '';
+ $styles = $settingsController->parseStylesToArray( $styles );
- // Font size
- if (isset($parsedBlock['email_attrs']['font-size'])) {
- $styles['font-size'] = $parsedBlock['email_attrs']['font-size'];
- } else {
- // Use font-size from email theme when those properties are not set
- $themeData = $settingsController->getTheme()->get_data();
- $styles['font-size'] = $themeData['styles']['typography']['fontSize'];
- }
+ // Font size
+ if ( isset( $parsedBlock['email_attrs']['font-size'] ) ) {
+ $styles['font-size'] = $parsedBlock['email_attrs']['font-size'];
+ } else {
+ // Use font-size from email theme when those properties are not set
+ $themeData = $settingsController->getTheme()->get_data();
+ $styles['font-size'] = $themeData['styles']['typography']['fontSize'];
+ }
- $html->set_attribute('style', esc_attr(\WP_Style_Engine::compile_css($styles, '')));
- $blockContent = $html->get_updated_html();
- }
+ $html->set_attribute( 'style', esc_attr( \WP_Style_Engine::compile_css( $styles, '' ) ) );
+ $blockContent = $html->get_updated_html();
+ }
- $wrapperStyle = \WP_Style_Engine::compile_css([
- 'margin-top' => $parsedBlock['email_attrs']['margin-top'] ?? '0px',
- ], '');
+ $wrapperStyle = \WP_Style_Engine::compile_css(
+ array(
+ 'margin-top' => $parsedBlock['email_attrs']['margin-top'] ?? '0px',
+ ),
+ ''
+ );
- // \WP_HTML_Tag_Processor escapes the content, so we have to replace it back
- $blockContent = str_replace(''', "'", $blockContent);
+ // \WP_HTML_Tag_Processor escapes the content, so we have to replace it back
+ $blockContent = str_replace( ''', "'", $blockContent );
- return sprintf(
- '%2$s ',
- esc_attr($wrapperStyle),
- $blockContent
- );
- }
+ return sprintf(
+ '%2$s ',
+ esc_attr( $wrapperStyle ),
+ $blockContent
+ );
+ }
}
diff --git a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-list-item.php b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-list-item.php
index 4b420fa574..c8c508daae 100644
--- a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-list-item.php
+++ b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-list-item.php
@@ -5,14 +5,14 @@ namespace MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks;
use MailPoet\EmailEditor\Engine\Settings_Controller;
class List_Item extends Abstract_Block_Renderer {
- /**
- * Override this method to disable spacing (block gap) for list items.
- */
- protected function addSpacer($content, $emailAttrs): string {
- return $content;
- }
+ /**
+ * Override this method to disable spacing (block gap) for list items.
+ */
+ protected function addSpacer( $content, $emailAttrs ): string {
+ return $content;
+ }
- protected function renderContent($blockContent, array $parsedBlock, Settings_Controller $settingsController): string {
- return $blockContent;
- }
+ protected function renderContent( $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ return $blockContent;
+ }
}
diff --git a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-text.php b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-text.php
index 71729c728d..b474f1f1bd 100644
--- a/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-text.php
+++ b/packages/php/email-editor/src/Integrations/Core/Renderer/Blocks/class-text.php
@@ -8,53 +8,58 @@ use MailPoet\EmailEditor\Engine\Settings_Controller;
* This renderer covers both core/paragraph and core/heading blocks
*/
class Text extends Abstract_Block_Renderer {
- protected function renderContent(string $blockContent, array $parsedBlock, Settings_Controller $settingsController): string {
- // Do not render empty blocks.
- if (empty(trim(strip_tags($blockContent)))) {
- return '';
- }
+ protected function renderContent( string $blockContent, array $parsedBlock, Settings_Controller $settingsController ): string {
+ // Do not render empty blocks.
+ if ( empty( trim( strip_tags( $blockContent ) ) ) ) {
+ return '';
+ }
- $blockContent = $this->adjustStyleAttribute($blockContent);
- $blockAttributes = wp_parse_args($parsedBlock['attrs'] ?? [], [
- 'textAlign' => 'left',
- 'style' => [],
- ]);
- $html = new \WP_HTML_Tag_Processor($blockContent);
- $classes = 'email-text-block';
- if ($html->next_tag()) {
- $blockClasses = $html->get_attribute('class') ?? '';
- $classes .= ' ' . $blockClasses;
- // remove has-background to prevent double padding applied for wrapper and inner element
- $blockClasses = str_replace('has-background', '', $blockClasses);
- // remove border related classes because we handle border on wrapping table cell
- $blockClasses = preg_replace('/[a-z-]+-border-[a-z-]+/', '', $blockClasses);
- $html->set_attribute('class', trim($blockClasses));
- $blockContent = $html->get_updated_html();
- }
+ $blockContent = $this->adjustStyleAttribute( $blockContent );
+ $blockAttributes = wp_parse_args(
+ $parsedBlock['attrs'] ?? array(),
+ array(
+ 'textAlign' => 'left',
+ 'style' => array(),
+ )
+ );
+ $html = new \WP_HTML_Tag_Processor( $blockContent );
+ $classes = 'email-text-block';
+ if ( $html->next_tag() ) {
+ $blockClasses = $html->get_attribute( 'class' ) ?? '';
+ $classes .= ' ' . $blockClasses;
+ // remove has-background to prevent double padding applied for wrapper and inner element
+ $blockClasses = str_replace( 'has-background', '', $blockClasses );
+ // remove border related classes because we handle border on wrapping table cell
+ $blockClasses = preg_replace( '/[a-z-]+-border-[a-z-]+/', '', $blockClasses );
+ $html->set_attribute( 'class', trim( $blockClasses ) );
+ $blockContent = $html->get_updated_html();
+ }
- $blockStyles = $this->getStylesFromBlock([
- 'color' => $blockAttributes['style']['color'] ?? [],
- 'spacing' => $blockAttributes['style']['spacing'] ?? [],
- 'typography' => $blockAttributes['style']['typography'] ?? [],
- 'border' => $blockAttributes['style']['border'] ?? [],
- ]);
+ $blockStyles = $this->getStylesFromBlock(
+ array(
+ 'color' => $blockAttributes['style']['color'] ?? array(),
+ 'spacing' => $blockAttributes['style']['spacing'] ?? array(),
+ 'typography' => $blockAttributes['style']['typography'] ?? array(),
+ 'border' => $blockAttributes['style']['border'] ?? array(),
+ )
+ );
- $styles = [
- 'min-width' => '100%', // prevent Gmail App from shrinking the table on mobile devices
- ];
+ $styles = array(
+ 'min-width' => '100%', // prevent Gmail App from shrinking the table on mobile devices
+ );
- $styles['text-align'] = 'left';
- if (isset($parsedBlock['attrs']['textAlign'])) {
- $styles['text-align'] = $parsedBlock['attrs']['textAlign'];
- } elseif (in_array($parsedBlock['attrs']['align'] ?? null, ['left', 'center', 'right'])) {
- $styles['text-align'] = $parsedBlock['attrs']['align'];
- }
+ $styles['text-align'] = 'left';
+ if ( isset( $parsedBlock['attrs']['textAlign'] ) ) {
+ $styles['text-align'] = $parsedBlock['attrs']['textAlign'];
+ } elseif ( in_array( $parsedBlock['attrs']['align'] ?? null, array( 'left', 'center', 'right' ) ) ) {
+ $styles['text-align'] = $parsedBlock['attrs']['align'];
+ }
- $compiledStyles = $this->compileCss($blockStyles['declarations'], $styles);
- $tableStyles = 'border-collapse: separate;'; // Needed because of border radius
+ $compiledStyles = $this->compileCss( $blockStyles['declarations'], $styles );
+ $tableStyles = 'border-collapse: separate;'; // Needed because of border radius
- return sprintf(
- '',
- esc_attr($tableStyles),
- esc_attr($classes),
- esc_attr($compiledStyles),
- esc_attr($styles['text-align'] ?? 'left'),
- $blockContent
- );
- }
+ esc_attr( $tableStyles ),
+ esc_attr( $classes ),
+ esc_attr( $compiledStyles ),
+ esc_attr( $styles['text-align'] ?? 'left' ),
+ $blockContent
+ );
+ }
- /**
- * 1) We need to remove padding because we render padding on wrapping table cell
- * 2) We also need to replace font-size to avoid clamp() because clamp() is not supported in many email clients.
- * The font size values is automatically converted to clamp() when WP site theme is configured to use fluid layouts.
- * Currently (WP 6.5), there is no way to disable this behavior.
- */
- private function adjustStyleAttribute(string $blockContent): string {
- $html = new \WP_HTML_Tag_Processor($blockContent);
+ /**
+ * 1) We need to remove padding because we render padding on wrapping table cell
+ * 2) We also need to replace font-size to avoid clamp() because clamp() is not supported in many email clients.
+ * The font size values is automatically converted to clamp() when WP site theme is configured to use fluid layouts.
+ * Currently (WP 6.5), there is no way to disable this behavior.
+ */
+ private function adjustStyleAttribute( string $blockContent ): string {
+ $html = new \WP_HTML_Tag_Processor( $blockContent );
- if ($html->next_tag()) {
- $elementStyle = $html->get_attribute('style') ?? '';
- // Padding may contain value like 10px or variable like var(--spacing-10)
- $elementStyle = preg_replace('/padding[^:]*:.?[0-9a-z-()]+;?/', '', $elementStyle);
+ if ( $html->next_tag() ) {
+ $elementStyle = $html->get_attribute( 'style' ) ?? '';
+ // Padding may contain value like 10px or variable like var(--spacing-10)
+ $elementStyle = preg_replace( '/padding[^:]*:.?[0-9a-z-()]+;?/', '', $elementStyle );
- // Remove border styles. We apply border styles on the wrapping table cell
- $elementStyle = preg_replace('/border[^:]*:.?[0-9a-z-()#]+;?/', '', $elementStyle);
+ // Remove border styles. We apply border styles on the wrapping table cell
+ $elementStyle = preg_replace( '/border[^:]*:.?[0-9a-z-()#]+;?/', '', $elementStyle );
- // We define the font-size on the wrapper element, but we need to keep font-size definition here
- // to prevent CSS Inliner from adding a default value and overriding the value set by user, which is on the wrapper element.
- // The value provided by WP uses clamp() function which is not supported in many email clients
- $elementStyle = preg_replace('/font-size:[^;]+;?/', 'font-size: inherit;', $elementStyle);
- $html->set_attribute('style', esc_attr($elementStyle));
- $blockContent = $html->get_updated_html();
- }
+ // We define the font-size on the wrapper element, but we need to keep font-size definition here
+ // to prevent CSS Inliner from adding a default value and overriding the value set by user, which is on the wrapper element.
+ // The value provided by WP uses clamp() function which is not supported in many email clients
+ $elementStyle = preg_replace( '/font-size:[^;]+;?/', 'font-size: inherit;', $elementStyle );
+ $html->set_attribute( 'style', esc_attr( $elementStyle ) );
+ $blockContent = $html->get_updated_html();
+ }
- return $blockContent;
- }
+ return $blockContent;
+ }
}
diff --git a/packages/php/email-editor/src/Integrations/Core/class-initializer.php b/packages/php/email-editor/src/Integrations/Core/class-initializer.php
index 56edc741c1..878ecf8a2a 100644
--- a/packages/php/email-editor/src/Integrations/Core/class-initializer.php
+++ b/packages/php/email-editor/src/Integrations/Core/class-initializer.php
@@ -6,49 +6,49 @@ use MailPoet\EmailEditor\Engine\Renderer\ContentRenderer\Blocks_Registry;
use MailPoet\EmailEditor\Engine\Renderer\ContentRenderer\Layout\Flex_Layout_Renderer;
class Initializer {
- public function initialize(): void {
- add_action('mailpoet_blocks_renderer_initialized', [$this, 'registerCoreBlocksRenderers'], 10, 1);
- add_filter('mailpoet_email_editor_theme_json', [$this, 'adjustThemeJson'], 10, 1);
- add_filter('safe_style_css', [$this, 'allowStyles']);
- }
+ public function initialize(): void {
+ add_action( 'mailpoet_blocks_renderer_initialized', array( $this, 'registerCoreBlocksRenderers' ), 10, 1 );
+ add_filter( 'mailpoet_email_editor_theme_json', array( $this, 'adjustThemeJson' ), 10, 1 );
+ add_filter( 'safe_style_css', array( $this, 'allowStyles' ) );
+ }
- /**
- * Register core blocks email renderers when the blocks renderer is initialized.
- */
- public function registerCoreBlocksRenderers(Blocks_Registry $blocksRegistry): void {
- $blocksRegistry->addBlockRenderer('core/paragraph', new Renderer\Blocks\Text());
- $blocksRegistry->addBlockRenderer('core/heading', new Renderer\Blocks\Text());
- $blocksRegistry->addBlockRenderer('core/column', new Renderer\Blocks\Column());
- $blocksRegistry->addBlockRenderer('core/columns', new Renderer\Blocks\Columns());
- $blocksRegistry->addBlockRenderer('core/list', new Renderer\Blocks\List_Block());
- $blocksRegistry->addBlockRenderer('core/list-item', new Renderer\Blocks\List_Item());
- $blocksRegistry->addBlockRenderer('core/image', new Renderer\Blocks\Image());
- $blocksRegistry->addBlockRenderer('core/buttons', new Renderer\Blocks\Buttons(new Flex_Layout_Renderer()));
- $blocksRegistry->addBlockRenderer('core/button', new Renderer\Blocks\Button());
- $blocksRegistry->addBlockRenderer('core/group', new Renderer\Blocks\Group());
- // Render used for all other blocks
- $blocksRegistry->addFallbackRenderer(new Renderer\Blocks\Fallback());
- }
+ /**
+ * Register core blocks email renderers when the blocks renderer is initialized.
+ */
+ public function registerCoreBlocksRenderers( Blocks_Registry $blocksRegistry ): void {
+ $blocksRegistry->addBlockRenderer( 'core/paragraph', new Renderer\Blocks\Text() );
+ $blocksRegistry->addBlockRenderer( 'core/heading', new Renderer\Blocks\Text() );
+ $blocksRegistry->addBlockRenderer( 'core/column', new Renderer\Blocks\Column() );
+ $blocksRegistry->addBlockRenderer( 'core/columns', new Renderer\Blocks\Columns() );
+ $blocksRegistry->addBlockRenderer( 'core/list', new Renderer\Blocks\List_Block() );
+ $blocksRegistry->addBlockRenderer( 'core/list-item', new Renderer\Blocks\List_Item() );
+ $blocksRegistry->addBlockRenderer( 'core/image', new Renderer\Blocks\Image() );
+ $blocksRegistry->addBlockRenderer( 'core/buttons', new Renderer\Blocks\Buttons( new Flex_Layout_Renderer() ) );
+ $blocksRegistry->addBlockRenderer( 'core/button', new Renderer\Blocks\Button() );
+ $blocksRegistry->addBlockRenderer( 'core/group', new Renderer\Blocks\Group() );
+ // Render used for all other blocks
+ $blocksRegistry->addFallbackRenderer( new Renderer\Blocks\Fallback() );
+ }
- /**
- * Adjusts the editor's theme to add blocks specific settings for core blocks.
- */
- public function adjustThemeJson(\WP_Theme_JSON $editorThemeJson): \WP_Theme_JSON {
- $themeJson = (string)file_get_contents(dirname(__FILE__) . '/theme.json');
- $themeJson = json_decode($themeJson, true);
- /** @var array $themeJson */
- $editorThemeJson->merge(new \WP_Theme_JSON($themeJson, 'default'));
- return $editorThemeJson;
- }
+ /**
+ * Adjusts the editor's theme to add blocks specific settings for core blocks.
+ */
+ public function adjustThemeJson( \WP_Theme_JSON $editorThemeJson ): \WP_Theme_JSON {
+ $themeJson = (string) file_get_contents( __DIR__ . '/theme.json' );
+ $themeJson = json_decode( $themeJson, true );
+ /** @var array $themeJson */
+ $editorThemeJson->merge( new \WP_Theme_JSON( $themeJson, 'default' ) );
+ return $editorThemeJson;
+ }
- /**
- * Allow styles for the email editor.
- */
- public function allowStyles(array $allowedStyles): array {
- $allowedStyles[] = 'display';
- $allowedStyles[] = 'mso-padding-alt';
- $allowedStyles[] = 'mso-font-width';
- $allowedStyles[] = 'mso-text-raise';
- return $allowedStyles;
- }
+ /**
+ * Allow styles for the email editor.
+ */
+ public function allowStyles( array $allowedStyles ): array {
+ $allowedStyles[] = 'display';
+ $allowedStyles[] = 'mso-padding-alt';
+ $allowedStyles[] = 'mso-font-width';
+ $allowedStyles[] = 'mso-text-raise';
+ return $allowedStyles;
+ }
}
diff --git a/packages/php/email-editor/src/Integrations/Utils/class-dom-document-helper.php b/packages/php/email-editor/src/Integrations/Utils/class-dom-document-helper.php
index 9e864d6f62..5fd8aa9802 100644
--- a/packages/php/email-editor/src/Integrations/Utils/class-dom-document-helper.php
+++ b/packages/php/email-editor/src/Integrations/Utils/class-dom-document-helper.php
@@ -6,55 +6,57 @@ namespace MailPoet\EmailEditor\Integrations\Utils;
* This class should guarantee that our work with the DOMDocument is unified and safe.
*/
class Dom_Document_Helper {
- private \DOMDocument $dom;
+ private \DOMDocument $dom;
- public function __construct(
- string $htmlContent
- ) {
- $this->loadHtml($htmlContent);
- }
+ public function __construct(
+ string $htmlContent
+ ) {
+ $this->loadHtml( $htmlContent );
+ }
- private function loadHtml(string $htmlContent): void {
- libxml_use_internal_errors(true);
- $this->dom = new \DOMDocument();
- if (!empty($htmlContent)) {
- // prefixing the content with the XML declaration to force the input encoding to UTF-8
- $this->dom->loadHTML('' . $htmlContent, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
- }
- libxml_clear_errors();
- }
+ private function loadHtml( string $htmlContent ): void {
+ libxml_use_internal_errors( true );
+ $this->dom = new \DOMDocument();
+ if ( ! empty( $htmlContent ) ) {
+ // prefixing the content with the XML declaration to force the input encoding to UTF-8
+ $this->dom->loadHTML( '' . $htmlContent, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD );
+ }
+ libxml_clear_errors();
+ }
- public function findElement(string $tagName): ?\DOMElement {
- $elements = $this->dom->getElementsByTagName($tagName);
- return $elements->item(0) ?: null;
- }
+ public function findElement( string $tagName ): ?\DOMElement {
+ $elements = $this->dom->getElementsByTagName( $tagName );
+ return $elements->item( 0 ) ?: null;
+ }
- public function getAttributeValue(\DOMElement $element, string $attribute): string {
- return $element->hasAttribute($attribute) ? $element->getAttribute($attribute) : '';
- }
+ public function getAttributeValue( \DOMElement $element, string $attribute ): string {
+ return $element->hasAttribute( $attribute ) ? $element->getAttribute( $attribute ) : '';
+ }
- /**
- * Searches for the first appearance of the given tag name and returns the value of specified attribute.
- */
- public function getAttributeValueByTagName(string $tagName, string $attribute): ?string {
- $element = $this->findElement($tagName);
- if (!$element) {
- return null;
- }
- return $this->getAttributeValue($element, $attribute);
- }
+ /**
+ * Searches for the first appearance of the given tag name and returns the value of specified attribute.
+ */
+ public function getAttributeValueByTagName( string $tagName, string $attribute ): ?string {
+ $element = $this->findElement( $tagName );
+ if ( ! $element ) {
+ return null;
+ }
+ return $this->getAttributeValue( $element, $attribute );
+ }
- public function getOuterHtml(\DOMElement $element): string {
- return (string)$this->dom->saveHTML($element);
- }
+ public function getOuterHtml( \DOMElement $element ): string {
+ return (string) $this->dom->saveHTML( $element );
+ }
- public function getElementInnerHTML(\DOMElement $element): string {
- $innerHTML = '';
- $children = $element->childNodes;
- foreach ($children as $child) {
- if (!$child instanceof \DOMNode) continue;
- $innerHTML .= $this->dom->saveHTML($child);
- }
- return $innerHTML;
- }
+ public function getElementInnerHTML( \DOMElement $element ): string {
+ $innerHTML = '';
+ $children = $element->childNodes;
+ foreach ( $children as $child ) {
+ if ( ! $child instanceof \DOMNode ) {
+ continue;
+ }
+ $innerHTML .= $this->dom->saveHTML( $child );
+ }
+ return $innerHTML;
+ }
}
diff --git a/packages/php/email-editor/src/Utils/class-cdn-asset-url.php b/packages/php/email-editor/src/Utils/class-cdn-asset-url.php
index b2900bec67..03c934ae19 100644
--- a/packages/php/email-editor/src/Utils/class-cdn-asset-url.php
+++ b/packages/php/email-editor/src/Utils/class-cdn-asset-url.php
@@ -3,18 +3,18 @@
namespace MailPoet\EmailEditor\Utils;
class Cdn_Asset_Url {
- const CDN_URL = 'https://ps.w.org/mailpoet/';
- /** @var string */
- private $baseUrl;
+ const CDN_URL = 'https://ps.w.org/mailpoet/';
+ /** @var string */
+ private $baseUrl;
- public function __construct(
- string $baseUrl
- ) {
- $this->baseUrl = $baseUrl;
- }
+ public function __construct(
+ string $baseUrl
+ ) {
+ $this->baseUrl = $baseUrl;
+ }
- public function generateCdnUrl($path) {
- $useCdn = defined('MAILPOET_USE_CDN') ? MAILPOET_USE_CDN : true;
- return ($useCdn ? self::CDN_URL : $this->baseUrl . '/plugin_repository/') . "assets/$path";
- }
+ public function generateCdnUrl( $path ) {
+ $useCdn = defined( 'MAILPOET_USE_CDN' ) ? MAILPOET_USE_CDN : true;
+ return ( $useCdn ? self::CDN_URL : $this->baseUrl . '/plugin_repository/' ) . "assets/$path";
+ }
}
diff --git a/packages/php/email-editor/src/Validator/Schema/class-any-of-schema.php b/packages/php/email-editor/src/Validator/Schema/class-any-of-schema.php
index 823e99d937..fca9e7ea06 100644
--- a/packages/php/email-editor/src/Validator/Schema/class-any-of-schema.php
+++ b/packages/php/email-editor/src/Validator/Schema/class-any-of-schema.php
@@ -6,32 +6,35 @@ use MailPoet\EmailEditor\Validator\Schema;
// See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#oneof-and-anyof
class Any_Of_Schema extends Schema {
- protected $schema = [
- 'anyOf' => [],
- ];
+ protected $schema = array(
+ 'anyOf' => array(),
+ );
- /** @param Schema[] $schemas */
- public function __construct(
- array $schemas
- ) {
- foreach ($schemas as $schema) {
- $this->schema['anyOf'][] = $schema->toArray();
- }
- }
+ /** @param Schema[] $schemas */
+ public function __construct(
+ array $schemas
+ ) {
+ foreach ( $schemas as $schema ) {
+ $this->schema['anyOf'][] = $schema->toArray();
+ }
+ }
- public function nullable(): self {
- $null = ['type' => 'null'];
- $anyOf = $this->schema['anyOf'];
- $value = in_array($null, $anyOf, true) ? $anyOf : array_merge($anyOf, [$null]);
- return $this->updateSchemaProperty('anyOf', $value);
- }
+ public function nullable(): self {
+ $null = array( 'type' => 'null' );
+ $anyOf = $this->schema['anyOf'];
+ $value = in_array( $null, $anyOf, true ) ? $anyOf : array_merge( $anyOf, array( $null ) );
+ return $this->updateSchemaProperty( 'anyOf', $value );
+ }
- public function nonNullable(): self {
- $null = ['type' => 'null'];
- $anyOf = $this->schema['anyOf'];
- $value = array_filter($anyOf, function ($item) use ($null) {
- return $item !== $null;
- });
- return $this->updateSchemaProperty('anyOf', $value);
- }
+ public function nonNullable(): self {
+ $null = array( 'type' => 'null' );
+ $anyOf = $this->schema['anyOf'];
+ $value = array_filter(
+ $anyOf,
+ function ( $item ) use ( $null ) {
+ return $item !== $null;
+ }
+ );
+ return $this->updateSchemaProperty( 'anyOf', $value );
+ }
}
diff --git a/packages/php/email-editor/src/Validator/Schema/class-array-schema.php b/packages/php/email-editor/src/Validator/Schema/class-array-schema.php
index 9860d01fb3..7d3500950a 100644
--- a/packages/php/email-editor/src/Validator/Schema/class-array-schema.php
+++ b/packages/php/email-editor/src/Validator/Schema/class-array-schema.php
@@ -6,23 +6,23 @@ use MailPoet\EmailEditor\Validator\Schema;
// See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#arrays
class Array_Schema extends Schema {
- protected $schema = [
- 'type' => 'array',
- ];
+ protected $schema = array(
+ 'type' => 'array',
+ );
- public function items(Schema $schema): self {
- return $this->updateSchemaProperty('items', $schema->toArray());
- }
+ public function items( Schema $schema ): self {
+ return $this->updateSchemaProperty( 'items', $schema->toArray() );
+ }
- public function minItems(int $value): self {
- return $this->updateSchemaProperty('minItems', $value);
- }
+ public function minItems( int $value ): self {
+ return $this->updateSchemaProperty( 'minItems', $value );
+ }
- public function maxItems(int $value): self {
- return $this->updateSchemaProperty('maxItems', $value);
- }
+ public function maxItems( int $value ): self {
+ return $this->updateSchemaProperty( 'maxItems', $value );
+ }
- public function uniqueItems(): self {
- return $this->updateSchemaProperty('uniqueItems', true);
- }
+ public function uniqueItems(): self {
+ return $this->updateSchemaProperty( 'uniqueItems', true );
+ }
}
diff --git a/packages/php/email-editor/src/Validator/Schema/class-boolean-schema.php b/packages/php/email-editor/src/Validator/Schema/class-boolean-schema.php
index 023ea2fcd2..e314e1567d 100644
--- a/packages/php/email-editor/src/Validator/Schema/class-boolean-schema.php
+++ b/packages/php/email-editor/src/Validator/Schema/class-boolean-schema.php
@@ -6,7 +6,7 @@ use MailPoet\EmailEditor\Validator\Schema;
// See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#primitive-types
class Boolean_Schema extends Schema {
- protected $schema = [
- 'type' => 'boolean',
- ];
+ protected $schema = array(
+ 'type' => 'boolean',
+ );
}
diff --git a/packages/php/email-editor/src/Validator/Schema/class-integer-schema.php b/packages/php/email-editor/src/Validator/Schema/class-integer-schema.php
index 753bd6213d..14bcf32359 100644
--- a/packages/php/email-editor/src/Validator/Schema/class-integer-schema.php
+++ b/packages/php/email-editor/src/Validator/Schema/class-integer-schema.php
@@ -6,31 +6,31 @@ use MailPoet\EmailEditor\Validator\Schema;
// See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#numbers
class Integer_Schema extends Schema {
- protected $schema = [
- 'type' => 'integer',
- ];
+ protected $schema = array(
+ 'type' => 'integer',
+ );
- public function minimum(int $value): self {
- return $this->updateSchemaProperty('minimum', $value)
- ->unsetSchemaProperty('exclusiveMinimum');
- }
+ public function minimum( int $value ): self {
+ return $this->updateSchemaProperty( 'minimum', $value )
+ ->unsetSchemaProperty( 'exclusiveMinimum' );
+ }
- public function exclusiveMinimum(int $value): self {
- return $this->updateSchemaProperty('minimum', $value)
- ->updateSchemaProperty('exclusiveMinimum', true);
- }
+ public function exclusiveMinimum( int $value ): self {
+ return $this->updateSchemaProperty( 'minimum', $value )
+ ->updateSchemaProperty( 'exclusiveMinimum', true );
+ }
- public function maximum(int $value): self {
- return $this->updateSchemaProperty('maximum', $value)
- ->unsetSchemaProperty('exclusiveMaximum');
- }
+ public function maximum( int $value ): self {
+ return $this->updateSchemaProperty( 'maximum', $value )
+ ->unsetSchemaProperty( 'exclusiveMaximum' );
+ }
- public function exclusiveMaximum(int $value): self {
- return $this->updateSchemaProperty('maximum', $value)
- ->updateSchemaProperty('exclusiveMaximum', true);
- }
+ public function exclusiveMaximum( int $value ): self {
+ return $this->updateSchemaProperty( 'maximum', $value )
+ ->updateSchemaProperty( 'exclusiveMaximum', true );
+ }
- public function multipleOf(int $value): self {
- return $this->updateSchemaProperty('multipleOf', $value);
- }
+ public function multipleOf( int $value ): self {
+ return $this->updateSchemaProperty( 'multipleOf', $value );
+ }
}
diff --git a/packages/php/email-editor/src/Validator/Schema/class-null-schema.php b/packages/php/email-editor/src/Validator/Schema/class-null-schema.php
index 329c4d7ff6..4d5bf7e84e 100644
--- a/packages/php/email-editor/src/Validator/Schema/class-null-schema.php
+++ b/packages/php/email-editor/src/Validator/Schema/class-null-schema.php
@@ -6,7 +6,7 @@ use MailPoet\EmailEditor\Validator\Schema;
// See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#primitive-types
class Null_Schema extends Schema {
- protected $schema = [
- 'type' => 'null',
- ];
+ protected $schema = array(
+ 'type' => 'null',
+ );
}
diff --git a/packages/php/email-editor/src/Validator/Schema/class-number-schema.php b/packages/php/email-editor/src/Validator/Schema/class-number-schema.php
index 11dac4c519..69423a2bd8 100644
--- a/packages/php/email-editor/src/Validator/Schema/class-number-schema.php
+++ b/packages/php/email-editor/src/Validator/Schema/class-number-schema.php
@@ -6,31 +6,31 @@ use MailPoet\EmailEditor\Validator\Schema;
// See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#numbers
class Number_Schema extends Schema {
- protected $schema = [
- 'type' => 'number',
- ];
+ protected $schema = array(
+ 'type' => 'number',
+ );
- public function minimum(float $value): self {
- return $this->updateSchemaProperty('minimum', $value)
- ->unsetSchemaProperty('exclusiveMinimum');
- }
+ public function minimum( float $value ): self {
+ return $this->updateSchemaProperty( 'minimum', $value )
+ ->unsetSchemaProperty( 'exclusiveMinimum' );
+ }
- public function exclusiveMinimum(float $value): self {
- return $this->updateSchemaProperty('minimum', $value)
- ->updateSchemaProperty('exclusiveMinimum', true);
- }
+ public function exclusiveMinimum( float $value ): self {
+ return $this->updateSchemaProperty( 'minimum', $value )
+ ->updateSchemaProperty( 'exclusiveMinimum', true );
+ }
- public function maximum(float $value): self {
- return $this->updateSchemaProperty('maximum', $value)
- ->unsetSchemaProperty('exclusiveMaximum');
- }
+ public function maximum( float $value ): self {
+ return $this->updateSchemaProperty( 'maximum', $value )
+ ->unsetSchemaProperty( 'exclusiveMaximum' );
+ }
- public function exclusiveMaximum(float $value): self {
- return $this->updateSchemaProperty('maximum', $value)
- ->updateSchemaProperty('exclusiveMaximum', true);
- }
+ public function exclusiveMaximum( float $value ): self {
+ return $this->updateSchemaProperty( 'maximum', $value )
+ ->updateSchemaProperty( 'exclusiveMaximum', true );
+ }
- public function multipleOf(float $value): self {
- return $this->updateSchemaProperty('multipleOf', $value);
- }
+ public function multipleOf( float $value ): self {
+ return $this->updateSchemaProperty( 'multipleOf', $value );
+ }
}
diff --git a/packages/php/email-editor/src/Validator/Schema/class-object-schema.php b/packages/php/email-editor/src/Validator/Schema/class-object-schema.php
index c8e666f850..6e47da9f69 100644
--- a/packages/php/email-editor/src/Validator/Schema/class-object-schema.php
+++ b/packages/php/email-editor/src/Validator/Schema/class-object-schema.php
@@ -6,48 +6,51 @@ use MailPoet\EmailEditor\Validator\Schema;
// See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#objects
class Object_Schema extends Schema {
- protected $schema = [
- 'type' => 'object',
- ];
+ protected $schema = array(
+ 'type' => 'object',
+ );
- /** @param array $properties */
- public function properties(array $properties): self {
- return $this->updateSchemaProperty('properties', array_map(
- function (Schema $property) {
- return $property->toArray();
- },
- $properties
- ));
- }
+ /** @param array $properties */
+ public function properties( array $properties ): self {
+ return $this->updateSchemaProperty(
+ 'properties',
+ array_map(
+ function ( Schema $property ) {
+ return $property->toArray();
+ },
+ $properties
+ )
+ );
+ }
- public function additionalProperties(Schema $schema): self {
- return $this->updateSchemaProperty('additionalProperties', $schema->toArray());
- }
+ public function additionalProperties( Schema $schema ): self {
+ return $this->updateSchemaProperty( 'additionalProperties', $schema->toArray() );
+ }
- public function disableAdditionalProperties(): self {
- return $this->updateSchemaProperty('additionalProperties', false);
- }
+ public function disableAdditionalProperties(): self {
+ return $this->updateSchemaProperty( 'additionalProperties', false );
+ }
- /**
- * Keys of $properties are regular expressions without leading/trailing delimiters.
- * See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#patternproperties
- *
- * @param array $properties
- */
- public function patternProperties(array $properties): self {
- $patternProperties = [];
- foreach ($properties as $key => $value) {
- $this->validatePattern($key);
- $patternProperties[$key] = $value->toArray();
- }
- return $this->updateSchemaProperty('patternProperties', $patternProperties);
- }
+ /**
+ * Keys of $properties are regular expressions without leading/trailing delimiters.
+ * See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#patternproperties
+ *
+ * @param array $properties
+ */
+ public function patternProperties( array $properties ): self {
+ $patternProperties = array();
+ foreach ( $properties as $key => $value ) {
+ $this->validatePattern( $key );
+ $patternProperties[ $key ] = $value->toArray();
+ }
+ return $this->updateSchemaProperty( 'patternProperties', $patternProperties );
+ }
- public function minProperties(int $value): self {
- return $this->updateSchemaProperty('minProperties', $value);
- }
+ public function minProperties( int $value ): self {
+ return $this->updateSchemaProperty( 'minProperties', $value );
+ }
- public function maxProperties(int $value): self {
- return $this->updateSchemaProperty('maxProperties', $value);
- }
+ public function maxProperties( int $value ): self {
+ return $this->updateSchemaProperty( 'maxProperties', $value );
+ }
}
diff --git a/packages/php/email-editor/src/Validator/Schema/class-one-of-schema.php b/packages/php/email-editor/src/Validator/Schema/class-one-of-schema.php
index 5d1e540e2e..4162375394 100644
--- a/packages/php/email-editor/src/Validator/Schema/class-one-of-schema.php
+++ b/packages/php/email-editor/src/Validator/Schema/class-one-of-schema.php
@@ -6,32 +6,35 @@ use MailPoet\EmailEditor\Validator\Schema;
// See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#oneof-and-anyof
class One_Of_Schema extends Schema {
- protected $schema = [
- 'oneOf' => [],
- ];
+ protected $schema = array(
+ 'oneOf' => array(),
+ );
- /** @param Schema[] $schemas */
- public function __construct(
- array $schemas
- ) {
- foreach ($schemas as $schema) {
- $this->schema['oneOf'][] = $schema->toArray();
- }
- }
+ /** @param Schema[] $schemas */
+ public function __construct(
+ array $schemas
+ ) {
+ foreach ( $schemas as $schema ) {
+ $this->schema['oneOf'][] = $schema->toArray();
+ }
+ }
- public function nullable(): self {
- $null = ['type' => 'null'];
- $oneOf = $this->schema['oneOf'];
- $value = in_array($null, $oneOf, true) ? $oneOf : array_merge($oneOf, [$null]);
- return $this->updateSchemaProperty('oneOf', $value);
- }
+ public function nullable(): self {
+ $null = array( 'type' => 'null' );
+ $oneOf = $this->schema['oneOf'];
+ $value = in_array( $null, $oneOf, true ) ? $oneOf : array_merge( $oneOf, array( $null ) );
+ return $this->updateSchemaProperty( 'oneOf', $value );
+ }
- public function nonNullable(): self {
- $null = ['type' => 'null'];
- $oneOf = $this->schema['oneOf'];
- $value = array_filter($oneOf, function ($item) use ($null) {
- return $item !== $null;
- });
- return $this->updateSchemaProperty('oneOf', $value);
- }
+ public function nonNullable(): self {
+ $null = array( 'type' => 'null' );
+ $oneOf = $this->schema['oneOf'];
+ $value = array_filter(
+ $oneOf,
+ function ( $item ) use ( $null ) {
+ return $item !== $null;
+ }
+ );
+ return $this->updateSchemaProperty( 'oneOf', $value );
+ }
}
diff --git a/packages/php/email-editor/src/Validator/Schema/class-string-schema.php b/packages/php/email-editor/src/Validator/Schema/class-string-schema.php
index b253f770dc..dd444bd4d0 100644
--- a/packages/php/email-editor/src/Validator/Schema/class-string-schema.php
+++ b/packages/php/email-editor/src/Validator/Schema/class-string-schema.php
@@ -6,48 +6,48 @@ use MailPoet\EmailEditor\Validator\Schema;
// See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#strings
class String_Schema extends Schema {
- protected $schema = [
- 'type' => 'string',
- ];
+ protected $schema = array(
+ 'type' => 'string',
+ );
- public function minLength(int $value): self {
- return $this->updateSchemaProperty('minLength', $value);
- }
+ public function minLength( int $value ): self {
+ return $this->updateSchemaProperty( 'minLength', $value );
+ }
- public function maxLength(int $value): self {
- return $this->updateSchemaProperty('maxLength', $value);
- }
+ public function maxLength( int $value ): self {
+ return $this->updateSchemaProperty( 'maxLength', $value );
+ }
- /**
- * Parameter $pattern is a regular expression without leading/trailing delimiters.
- * See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#pattern
- */
- public function pattern(string $pattern): self {
- $this->validatePattern($pattern);
- return $this->updateSchemaProperty('pattern', $pattern);
- }
+ /**
+ * Parameter $pattern is a regular expression without leading/trailing delimiters.
+ * See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/#pattern
+ */
+ public function pattern( string $pattern ): self {
+ $this->validatePattern( $pattern );
+ return $this->updateSchemaProperty( 'pattern', $pattern );
+ }
- public function formatDateTime(): self {
- return $this->updateSchemaProperty('format', 'date-time');
- }
+ public function formatDateTime(): self {
+ return $this->updateSchemaProperty( 'format', 'date-time' );
+ }
- public function formatEmail(): self {
- return $this->updateSchemaProperty('format', 'email');
- }
+ public function formatEmail(): self {
+ return $this->updateSchemaProperty( 'format', 'email' );
+ }
- public function formatHexColor(): self {
- return $this->updateSchemaProperty('format', 'hex-color');
- }
+ public function formatHexColor(): self {
+ return $this->updateSchemaProperty( 'format', 'hex-color' );
+ }
- public function formatIp(): self {
- return $this->updateSchemaProperty('format', 'ip');
- }
+ public function formatIp(): self {
+ return $this->updateSchemaProperty( 'format', 'ip' );
+ }
- public function formatUri(): self {
- return $this->updateSchemaProperty('format', 'uri');
- }
+ public function formatUri(): self {
+ return $this->updateSchemaProperty( 'format', 'uri' );
+ }
- public function formatUuid(): self {
- return $this->updateSchemaProperty('format', 'uuid');
- }
+ public function formatUuid(): self {
+ return $this->updateSchemaProperty( 'format', 'uuid' );
+ }
}
diff --git a/packages/php/email-editor/src/Validator/class-builder.php b/packages/php/email-editor/src/Validator/class-builder.php
index 0a8ce356ba..cbfd47f923 100644
--- a/packages/php/email-editor/src/Validator/class-builder.php
+++ b/packages/php/email-editor/src/Validator/class-builder.php
@@ -14,44 +14,44 @@ use MailPoet\EmailEditor\Validator\Schema\String_Schema;
// See: https://developer.wordpress.org/rest-api/extending-the-rest-api/schema/
class Builder {
- public static function string(): String_Schema {
- return new String_Schema();
- }
+ public static function string(): String_Schema {
+ return new String_Schema();
+ }
- public static function number(): Number_Schema {
- return new Number_Schema();
- }
+ public static function number(): Number_Schema {
+ return new Number_Schema();
+ }
- public static function integer(): Integer_Schema {
- return new Integer_Schema();
- }
+ public static function integer(): Integer_Schema {
+ return new Integer_Schema();
+ }
- public static function boolean(): Boolean_Schema {
- return new Boolean_Schema();
- }
+ public static function boolean(): Boolean_Schema {
+ return new Boolean_Schema();
+ }
- public static function null(): Null_Schema {
- return new Null_Schema();
- }
+ public static function null(): Null_Schema {
+ return new Null_Schema();
+ }
- public static function array(Schema $items = null): Array_Schema {
- $array = new Array_Schema();
- return $items ? $array->items($items) : $array;
- }
+ public static function array( Schema $items = null ): Array_Schema {
+ $array = new Array_Schema();
+ return $items ? $array->items( $items ) : $array;
+ }
- /** @param array|null $properties */
- public static function object(array $properties = null): Object_Schema {
- $object = new Object_Schema();
- return $properties === null ? $object : $object->properties($properties);
- }
+ /** @param array|null $properties */
+ public static function object( array $properties = null ): Object_Schema {
+ $object = new Object_Schema();
+ return $properties === null ? $object : $object->properties( $properties );
+ }
- /** @param Schema[] $schemas */
- public static function oneOf(array $schemas): One_Of_Schema {
- return new One_Of_Schema($schemas);
- }
+ /** @param Schema[] $schemas */
+ public static function oneOf( array $schemas ): One_Of_Schema {
+ return new One_Of_Schema( $schemas );
+ }
- /** @param Schema[] $schemas */
- public static function anyOf(array $schemas): Any_Of_Schema {
- return new Any_Of_Schema($schemas);
- }
+ /** @param Schema[] $schemas */
+ public static function anyOf( array $schemas ): Any_Of_Schema {
+ return new Any_Of_Schema( $schemas );
+ }
}
diff --git a/packages/php/email-editor/src/Validator/class-schema.php b/packages/php/email-editor/src/Validator/class-schema.php
index 6890c21d30..a87e948059 100644
--- a/packages/php/email-editor/src/Validator/class-schema.php
+++ b/packages/php/email-editor/src/Validator/class-schema.php
@@ -2,96 +2,95 @@
namespace MailPoet\EmailEditor\Validator;
-
use function json_encode;
use function rest_get_allowed_schema_keywords;
abstract class Schema {
- protected $schema = [];
+ protected $schema = array();
- /** @return static */
- public function nullable() {
- $type = $this->schema['type'] ?? ['null'];
- return $this->updateSchemaProperty('type', is_array($type) ? $type : [$type, 'null']);
- }
+ /** @return static */
+ public function nullable() {
+ $type = $this->schema['type'] ?? array( 'null' );
+ return $this->updateSchemaProperty( 'type', is_array( $type ) ? $type : array( $type, 'null' ) );
+ }
- /** @return static */
- public function nonNullable() {
- $type = $this->schema['type'] ?? null;
- return $type === null
- ? $this->unsetSchemaProperty('type')
- : $this->updateSchemaProperty('type', is_array($type) ? $type[0] : $type);
- }
+ /** @return static */
+ public function nonNullable() {
+ $type = $this->schema['type'] ?? null;
+ return $type === null
+ ? $this->unsetSchemaProperty( 'type' )
+ : $this->updateSchemaProperty( 'type', is_array( $type ) ? $type[0] : $type );
+ }
- /** @return static */
- public function required() {
- return $this->updateSchemaProperty('required', true);
- }
+ /** @return static */
+ public function required() {
+ return $this->updateSchemaProperty( 'required', true );
+ }
- /** @return static */
- public function optional() {
- return $this->unsetSchemaProperty('required');
- }
+ /** @return static */
+ public function optional() {
+ return $this->unsetSchemaProperty( 'required' );
+ }
- /** @return static */
- public function title(string $title) {
- return $this->updateSchemaProperty('title', $title);
- }
+ /** @return static */
+ public function title( string $title ) {
+ return $this->updateSchemaProperty( 'title', $title );
+ }
- /** @return static */
- public function description(string $description) {
- return $this->updateSchemaProperty('description', $description);
- }
+ /** @return static */
+ public function description( string $description ) {
+ return $this->updateSchemaProperty( 'description', $description );
+ }
- /** @return static */
- public function default($default) {
- return $this->updateSchemaProperty('default', $default);
- }
+ /** @return static */
+ public function default( $default ) {
+ return $this->updateSchemaProperty( 'default', $default );
+ }
- /** @return static */
- public function field(string $name, $value) {
- if (in_array($name, $this->getReservedKeywords(), true)) {
- throw new \Exception("Field name '$name' is reserved");
- }
- return $this->updateSchemaProperty($name, $value);
- }
+ /** @return static */
+ public function field( string $name, $value ) {
+ if ( in_array( $name, $this->getReservedKeywords(), true ) ) {
+ throw new \Exception( "Field name '$name' is reserved" );
+ }
+ return $this->updateSchemaProperty( $name, $value );
+ }
- public function toArray(): array {
- return $this->schema;
- }
+ public function toArray(): array {
+ return $this->schema;
+ }
- public function toString(): string {
- $json = json_encode($this->schema, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION);
- $error = json_last_error();
- if ($error || $json === false) {
- throw new \Exception(json_last_error_msg(), (string)$error);
- }
- return $json;
- }
+ public function toString(): string {
+ $json = json_encode( $this->schema, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION );
+ $error = json_last_error();
+ if ( $error || $json === false ) {
+ throw new \Exception( json_last_error_msg(), (string) $error );
+ }
+ return $json;
+ }
- /** @return static */
- protected function updateSchemaProperty(string $name, $value) {
- $clone = clone $this;
- $clone->schema[$name] = $value;
- return $clone;
- }
+ /** @return static */
+ protected function updateSchemaProperty( string $name, $value ) {
+ $clone = clone $this;
+ $clone->schema[ $name ] = $value;
+ return $clone;
+ }
- /** @return static */
- protected function unsetSchemaProperty(string $name) {
- $clone = clone $this;
- unset($clone->schema[$name]);
- return $clone;
- }
+ /** @return static */
+ protected function unsetSchemaProperty( string $name ) {
+ $clone = clone $this;
+ unset( $clone->schema[ $name ] );
+ return $clone;
+ }
- protected function getReservedKeywords(): array {
- return rest_get_allowed_schema_keywords();
- }
+ protected function getReservedKeywords(): array {
+ return rest_get_allowed_schema_keywords();
+ }
- protected function validatePattern(string $pattern): void {
- $escaped = str_replace('#', '\\#', $pattern);
- $regex = "#$escaped#u";
- if (@preg_match($regex, '') === false) {
- throw new \Exception("Invalid regular expression '$regex'");
- }
- }
+ protected function validatePattern( string $pattern ): void {
+ $escaped = str_replace( '#', '\\#', $pattern );
+ $regex = "#$escaped#u";
+ if ( @preg_match( $regex, '' ) === false ) {
+ throw new \Exception( "Invalid regular expression '$regex'" );
+ }
+ }
}
diff --git a/packages/php/email-editor/src/Validator/class-validation-exception.php b/packages/php/email-editor/src/Validator/class-validation-exception.php
index 72d27df852..ccb69633c6 100644
--- a/packages/php/email-editor/src/Validator/class-validation-exception.php
+++ b/packages/php/email-editor/src/Validator/class-validation-exception.php
@@ -6,17 +6,17 @@ use MailPoet\UnexpectedValueException;
use WP_Error;
class Validation_Exception extends UnexpectedValueException {
- /** @var WP_Error */
- protected $wpError;
+ /** @var WP_Error */
+ protected $wpError;
- public static function createFromWpError(WP_Error $wpError): self {
- $exception = self::create()
- ->withMessage($wpError->get_error_message());
- $exception->wpError = $wpError;
- return $exception;
- }
+ public static function createFromWpError( WP_Error $wpError ): self {
+ $exception = self::create()
+ ->withMessage( $wpError->get_error_message() );
+ $exception->wpError = $wpError;
+ return $exception;
+ }
- public function getWpError(): WP_Error {
- return $this->wpError;
- }
+ public function getWpError(): WP_Error {
+ return $this->wpError;
+ }
}
diff --git a/packages/php/email-editor/src/Validator/class-validator.php b/packages/php/email-editor/src/Validator/class-validator.php
index 2c0d601ce6..617486312a 100644
--- a/packages/php/email-editor/src/Validator/class-validator.php
+++ b/packages/php/email-editor/src/Validator/class-validator.php
@@ -8,202 +8,210 @@ use stdClass;
use WP_Error;
class Validator {
- /** @var WPFunctions */
- private $wp;
+ /** @var WPFunctions */
+ private $wp;
- public function __construct(
- WPFunctions $wp
- ) {
- $this->wp = $wp;
- }
+ public function __construct(
+ WPFunctions $wp
+ ) {
+ $this->wp = $wp;
+ }
- /**
- * Strict validation & sanitization implementation.
- * It only coerces int to float (e.g. 5 to 5.0).
- *
- * @param mixed $value
- * @return mixed
- */
- public function validate(Schema $schema, $value, string $paramName = 'value') {
- return $this->validateSchemaArray($schema->toArray(), $value, $paramName);
- }
+ /**
+ * Strict validation & sanitization implementation.
+ * It only coerces int to float (e.g. 5 to 5.0).
+ *
+ * @param mixed $value
+ * @return mixed
+ */
+ public function validate( Schema $schema, $value, string $paramName = 'value' ) {
+ return $this->validateSchemaArray( $schema->toArray(), $value, $paramName );
+ }
- /**
- * Strict validation & sanitization implementation.
- * It only coerces int to float (e.g. 5 to 5.0).
- *
- * @param array $schema. The array must follow the format, which is returned from Schema::toArray().
- * @param mixed $value
- * @return mixed
- */
- public function validateSchemaArray(array $schema, $value, string $paramName = 'value') {
- $result = $this->validateAndSanitizeValueFromSchema($value, $schema, $paramName);
- if ($result instanceof WP_Error) {
- throw Validation_Exception::createFromWpError($result);
- }
- return $result;
- }
+ /**
+ * Strict validation & sanitization implementation.
+ * It only coerces int to float (e.g. 5 to 5.0).
+ *
+ * @param array $schema. The array must follow the format, which is returned from Schema::toArray().
+ * @param mixed $value
+ * @return mixed
+ */
+ public function validateSchemaArray( array $schema, $value, string $paramName = 'value' ) {
+ $result = $this->validateAndSanitizeValueFromSchema( $value, $schema, $paramName );
+ if ( $result instanceof WP_Error ) {
+ throw Validation_Exception::createFromWpError( $result );
+ }
+ return $result;
+ }
- /**
- * Mirrors rest_validate_value_from_schema() and rest_sanitize_value_from_schema().
- *
- * @param mixed $value
- * @param array $schema
- * @param string $paramName
- * @return mixed|WP_Error
- */
- private function validateAndSanitizeValueFromSchema($value, array $schema, string $paramName) {
- // nullable
- $fullType = $schema['type'] ?? null;
- if (is_array($fullType) && in_array('null', $fullType, true) && $value === null) {
- return null;
- }
+ /**
+ * Mirrors rest_validate_value_from_schema() and rest_sanitize_value_from_schema().
+ *
+ * @param mixed $value
+ * @param array $schema
+ * @param string $paramName
+ * @return mixed|WP_Error
+ */
+ private function validateAndSanitizeValueFromSchema( $value, array $schema, string $paramName ) {
+ // nullable
+ $fullType = $schema['type'] ?? null;
+ if ( is_array( $fullType ) && in_array( 'null', $fullType, true ) && $value === null ) {
+ return null;
+ }
- // anyOf, oneOf
- if (isset($schema['anyOf'])) {
- return $this->validateAndSanitizeAnyOf($value, $schema, $paramName);
- } elseif (isset($schema['oneOf'])) {
- return $this->validateAndSanitizeOneOf($value, $schema, $paramName);
- }
+ // anyOf, oneOf
+ if ( isset( $schema['anyOf'] ) ) {
+ return $this->validateAndSanitizeAnyOf( $value, $schema, $paramName );
+ } elseif ( isset( $schema['oneOf'] ) ) {
+ return $this->validateAndSanitizeOneOf( $value, $schema, $paramName );
+ }
- // make types strict
- $type = is_array($fullType) ? $fullType[0] : $fullType;
- switch ($type) {
- case 'number':
- if (!is_float($value) && !is_int($value)) {
- return $this->getTypeError($paramName, $fullType);
- }
- break;
- case 'integer':
- if (!is_int($value)) {
- return $this->getTypeError($paramName, $fullType);
- }
- break;
- case 'boolean':
- if (!is_bool($value)) {
- return $this->getTypeError($paramName, $fullType);
- }
- break;
- case 'array':
- if (!is_array($value)) {
- return $this->getTypeError($paramName, $fullType);
- }
+ // make types strict
+ $type = is_array( $fullType ) ? $fullType[0] : $fullType;
+ switch ( $type ) {
+ case 'number':
+ if ( ! is_float( $value ) && ! is_int( $value ) ) {
+ return $this->getTypeError( $paramName, $fullType );
+ }
+ break;
+ case 'integer':
+ if ( ! is_int( $value ) ) {
+ return $this->getTypeError( $paramName, $fullType );
+ }
+ break;
+ case 'boolean':
+ if ( ! is_bool( $value ) ) {
+ return $this->getTypeError( $paramName, $fullType );
+ }
+ break;
+ case 'array':
+ if ( ! is_array( $value ) ) {
+ return $this->getTypeError( $paramName, $fullType );
+ }
- if (isset($schema['items'])) {
- foreach ($value as $i => $v) {
- $result = $this->validateAndSanitizeValueFromSchema($v, $schema['items'], $paramName . '[' . $i . ']');
- if ($this->wp->isWpError($result)) {
- return $result;
- }
- }
- }
- break;
- case 'object':
- if (!is_array($value) && !$value instanceof stdClass && !$value instanceof JsonSerializable) {
- return $this->getTypeError($paramName, $fullType);
- }
+ if ( isset( $schema['items'] ) ) {
+ foreach ( $value as $i => $v ) {
+ $result = $this->validateAndSanitizeValueFromSchema( $v, $schema['items'], $paramName . '[' . $i . ']' );
+ if ( $this->wp->isWpError( $result ) ) {
+ return $result;
+ }
+ }
+ }
+ break;
+ case 'object':
+ if ( ! is_array( $value ) && ! $value instanceof stdClass && ! $value instanceof JsonSerializable ) {
+ return $this->getTypeError( $paramName, $fullType );
+ }
- // ensure string keys
- $value = (array)($value instanceof JsonSerializable ? $value->jsonSerialize() : $value);
- if (count(array_filter(array_keys($value), 'is_string')) !== count($value)) {
- return $this->getTypeError($paramName, $fullType);
- }
+ // ensure string keys
+ $value = (array) ( $value instanceof JsonSerializable ? $value->jsonSerialize() : $value );
+ if ( count( array_filter( array_keys( $value ), 'is_string' ) ) !== count( $value ) ) {
+ return $this->getTypeError( $paramName, $fullType );
+ }
- // validate object properties
- foreach ($value as $k => $v) {
- if (isset($schema['properties'][$k])) {
- $result = $this->validateAndSanitizeValueFromSchema($v, $schema['properties'][$k], $paramName . '[' . $k . ']');
- if ($this->wp->isWpError($result)) {
- return $result;
- }
- continue;
- }
+ // validate object properties
+ foreach ( $value as $k => $v ) {
+ if ( isset( $schema['properties'][ $k ] ) ) {
+ $result = $this->validateAndSanitizeValueFromSchema( $v, $schema['properties'][ $k ], $paramName . '[' . $k . ']' );
+ if ( $this->wp->isWpError( $result ) ) {
+ return $result;
+ }
+ continue;
+ }
- $patternPropertySchema = $this->wp->restFindMatchingPatternPropertySchema($k, $schema);
- if ($patternPropertySchema) {
- $result = $this->validateAndSanitizeValueFromSchema($v, $patternPropertySchema, $paramName . '[' . $k . ']');
- if ($this->wp->isWpError($result)) {
- return $result;
- }
- continue;
- }
+ $patternPropertySchema = $this->wp->restFindMatchingPatternPropertySchema( $k, $schema );
+ if ( $patternPropertySchema ) {
+ $result = $this->validateAndSanitizeValueFromSchema( $v, $patternPropertySchema, $paramName . '[' . $k . ']' );
+ if ( $this->wp->isWpError( $result ) ) {
+ return $result;
+ }
+ continue;
+ }
- if (isset($schema['additionalProperties']) && is_array($schema['additionalProperties'])) {
- $result = $this->validateAndSanitizeValueFromSchema($v, $schema['additionalProperties'], $paramName . '[' . $k . ']');
- if ($this->wp->isWpError($result)) {
- return $result;
- }
- }
- }
- break;
- }
+ if ( isset( $schema['additionalProperties'] ) && is_array( $schema['additionalProperties'] ) ) {
+ $result = $this->validateAndSanitizeValueFromSchema( $v, $schema['additionalProperties'], $paramName . '[' . $k . ']' );
+ if ( $this->wp->isWpError( $result ) ) {
+ return $result;
+ }
+ }
+ }
+ break;
+ }
- $result = $this->wp->restValidateValueFromSchema($value, $schema, $paramName);
- if ($this->wp->isWpError($result)) {
- return $result;
- }
- return $this->wp->restSanitizeValueFromSchema($value, $schema, $paramName);
- }
+ $result = $this->wp->restValidateValueFromSchema( $value, $schema, $paramName );
+ if ( $this->wp->isWpError( $result ) ) {
+ return $result;
+ }
+ return $this->wp->restSanitizeValueFromSchema( $value, $schema, $paramName );
+ }
- /**
- * Mirrors rest_find_any_matching_schema().
- *
- * @param mixed $value
- * @return mixed|WP_Error
- */
- private function validateAndSanitizeAnyOf($value, array $anyOfSchema, string $paramName) {
- $errors = [];
- foreach ($anyOfSchema['anyOf'] as $index => $schema) {
- $result = $this->validateAndSanitizeValueFromSchema($value, $schema, $paramName);
- if (!$this->wp->isWpError($result)) {
- return $result;
- }
- $errors[] = ['error_object' => $result, 'schema' => $schema, 'index' => $index];
- }
- return $this->wp->restGetCombiningOperationError($value, $paramName, $errors);
- }
+ /**
+ * Mirrors rest_find_any_matching_schema().
+ *
+ * @param mixed $value
+ * @return mixed|WP_Error
+ */
+ private function validateAndSanitizeAnyOf( $value, array $anyOfSchema, string $paramName ) {
+ $errors = array();
+ foreach ( $anyOfSchema['anyOf'] as $index => $schema ) {
+ $result = $this->validateAndSanitizeValueFromSchema( $value, $schema, $paramName );
+ if ( ! $this->wp->isWpError( $result ) ) {
+ return $result;
+ }
+ $errors[] = array(
+ 'error_object' => $result,
+ 'schema' => $schema,
+ 'index' => $index,
+ );
+ }
+ return $this->wp->restGetCombiningOperationError( $value, $paramName, $errors );
+ }
- /**
- * Mirrors rest_find_one_matching_schema().
- *
- * @param mixed $value
- * @return mixed|WP_Error
- */
- private function validateAndSanitizeOneOf($value, array $oneOfSchema, string $paramName) {
- $matchingSchemas = [];
- $errors = [];
- $data = null;
- foreach ($oneOfSchema['oneOf'] as $index => $schema) {
- $result = $this->validateAndSanitizeValueFromSchema($value, $schema, $paramName);
- if ($this->wp->isWpError($result)) {
- $errors[] = ['error_object' => $result, 'schema' => $schema, 'index' => $index];
- } else {
- $data = $result;
- $matchingSchemas[$index] = $schema;
- }
- }
+ /**
+ * Mirrors rest_find_one_matching_schema().
+ *
+ * @param mixed $value
+ * @return mixed|WP_Error
+ */
+ private function validateAndSanitizeOneOf( $value, array $oneOfSchema, string $paramName ) {
+ $matchingSchemas = array();
+ $errors = array();
+ $data = null;
+ foreach ( $oneOfSchema['oneOf'] as $index => $schema ) {
+ $result = $this->validateAndSanitizeValueFromSchema( $value, $schema, $paramName );
+ if ( $this->wp->isWpError( $result ) ) {
+ $errors[] = array(
+ 'error_object' => $result,
+ 'schema' => $schema,
+ 'index' => $index,
+ );
+ } else {
+ $data = $result;
+ $matchingSchemas[ $index ] = $schema;
+ }
+ }
- if (!$matchingSchemas) {
- return $this->wp->restGetCombiningOperationError($value, $paramName, $errors);
- }
+ if ( ! $matchingSchemas ) {
+ return $this->wp->restGetCombiningOperationError( $value, $paramName, $errors );
+ }
- if (count($matchingSchemas) > 1) {
- // reuse WP method to generate detailed error
- $invalidSchema = ['type' => []];
- $oneOf = array_replace(array_fill(0, count($oneOfSchema['oneOf']), $invalidSchema), $matchingSchemas);
- return $this->wp->restFindOneMatchingSchema($value, ['oneOf' => $oneOf], $paramName);
- }
- return $data;
- }
+ if ( count( $matchingSchemas ) > 1 ) {
+ // reuse WP method to generate detailed error
+ $invalidSchema = array( 'type' => array() );
+ $oneOf = array_replace( array_fill( 0, count( $oneOfSchema['oneOf'] ), $invalidSchema ), $matchingSchemas );
+ return $this->wp->restFindOneMatchingSchema( $value, array( 'oneOf' => $oneOf ), $paramName );
+ }
+ return $data;
+ }
- /** @param string|string[] $type */
- private function getTypeError(string $param, $type): WP_Error {
- $type = is_array($type) ? $type : [$type];
- return new WP_Error(
- 'rest_invalid_type',
- // translators: %1$s is the current parameter and %2$s a comma-separated list of the allowed types.
- sprintf(__('%1$s is not of type %2$s.', 'mailpoet'), $param, implode(',', $type)),
- ['param' => $param]
- );
- }
+ /** @param string|string[] $type */
+ private function getTypeError( string $param, $type ): WP_Error {
+ $type = is_array( $type ) ? $type : array( $type );
+ return new WP_Error(
+ 'rest_invalid_type',
+ // translators: %1$s is the current parameter and %2$s a comma-separated list of the allowed types.
+ sprintf( __( '%1$s is not of type %2$s.', 'mailpoet' ), $param, implode( ',', $type ) ),
+ array( 'param' => $param )
+ );
+ }
}
diff --git a/packages/php/email-editor/src/class-container.php b/packages/php/email-editor/src/class-container.php
index a25c162de2..9cbc833398 100644
--- a/packages/php/email-editor/src/class-container.php
+++ b/packages/php/email-editor/src/class-container.php
@@ -3,31 +3,31 @@
namespace MailPoet\EmailEditor;
class Container {
- protected array $services = [];
- protected array $instances = [];
+ protected array $services = array();
+ protected array $instances = array();
- public function set(string $name, callable $callable): void {
- $this->services[$name] = $callable;
- }
+ public function set( string $name, callable $callable ): void {
+ $this->services[ $name ] = $callable;
+ }
- /**
- * @template T
- * @param class-string $name
- * @return T
- */
- public function get(string $name) {
- // Check if the service is already instantiated
- if (isset($this->instances[$name])) {
- return $this->instances[$name];
- }
+ /**
+ * @template T
+ * @param class-string $name
+ * @return T
+ */
+ public function get( string $name ) {
+ // Check if the service is already instantiated
+ if ( isset( $this->instances[ $name ] ) ) {
+ return $this->instances[ $name ];
+ }
- // Check if the service is registered
- if (!isset($this->services[$name])) {
- throw new \Exception("Service not found: $name");
- }
+ // Check if the service is registered
+ if ( ! isset( $this->services[ $name ] ) ) {
+ throw new \Exception( "Service not found: $name" );
+ }
- $this->instances[$name] = $this->services[$name]($this);
+ $this->instances[ $name ] = $this->services[ $name ]( $this );
- return $this->instances[$name];
- }
+ return $this->instances[ $name ];
+ }
}
| |  ) . '){kind=logo}
 ) . ')