Merge branch '7.0' into 7.1

ezpublishlegacy · Apr 11, 2018 · 8d9158b · 8d9158b
2 parents 4eeb57f + 5913982
commit 8d9158b
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 10 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/config/cache.yml b/eZ/Bundle/EzPublishCoreBundle/Resources/config/cache.yml
@@ -6,6 +6,7 @@ services:
     # in Core configuration, see eZ/Publish/Core/settings/storage_engines/cache.yml for details
     ezpublish.cache_pool:
         class: "%ezpublish.cache_pool.class%"
+        lazy: true
         factory: ["@ezpublish.cache_pool.factory", getCachePool]
         arguments: ["@ezpublish.config.resolver"]
 

diff --git a/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl b/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
@@ -358,6 +358,12 @@
     </xsl:element>
   </xsl:template>
 
+  <xsl:template match="docbook:th/text()">
+    <xsl:call-template name="breakLine">
+      <xsl:with-param name="text" select="."/>
+    </xsl:call-template>
+  </xsl:template>
+
   <xsl:template match="docbook:th">
     <xsl:element name="th" namespace="{$outputNamespace}">
       <xsl:if test="@class">
@@ -421,6 +427,12 @@
     </xsl:element>
   </xsl:template>
 
+  <xsl:template match="docbook:td/text()">
+    <xsl:call-template name="breakLine">
+      <xsl:with-param name="text" select="."/>
+    </xsl:call-template>
+  </xsl:template>
+
   <xsl:template match="docbook:td">
     <xsl:element name="td" namespace="{$outputNamespace}">
       <xsl:if test="@class">

diff --git a/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/docbook/xhtml5/output/core.xsl b/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/docbook/xhtml5/output/core.xsl
@@ -365,6 +365,12 @@
     </xsl:element>
   </xsl:template>
 
+  <xsl:template match="docbook:th/text()">
+    <xsl:call-template name="breakLine">
+      <xsl:with-param name="text" select="."/>
+    </xsl:call-template>
+  </xsl:template>
+
   <xsl:template match="docbook:th">
     <xsl:element name="th" namespace="{$outputNamespace}">
       <xsl:if test="@class">
@@ -428,6 +434,12 @@
     </xsl:element>
   </xsl:template>
 
+  <xsl:template match="docbook:td/text()">
+    <xsl:call-template name="breakLine">
+      <xsl:with-param name="text" select="."/>
+    </xsl:call-template>
+  </xsl:template>
+
   <xsl:template match="docbook:td">
     <xsl:element name="td" namespace="{$outputNamespace}">
       <xsl:if test="@class">

diff --git a/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl b/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl
@@ -437,7 +437,9 @@
           <xsl:value-of select="@scope"/>
         </xsl:attribute>
       </xsl:if>
-      <xsl:apply-templates/>
+      <xsl:call-template name="breakline">
+       <xsl:with-param name="node" select="node()"/>
+      </xsl:call-template>
     </th>
   </xsl:template>
 
@@ -491,7 +493,9 @@
           <xsl:value-of select="@rowspan"/>
         </xsl:attribute>
       </xsl:if>
-      <xsl:apply-templates/>
+      <xsl:call-template name="breakline">
+        <xsl:with-param name="node" select="node()"/>
+      </xsl:call-template>
     </td>
   </xsl:template>
 

diff --git a/eZ/Publish/Core/FieldType/Tests/RichText/Converter/Xslt/_fixtures/docbook/018-htmlTable.xml b/eZ/Publish/Core/FieldType/Tests/RichText/Converter/Xslt/_fixtures/docbook/018-htmlTable.xml
@@ -8,11 +8,13 @@
     <caption>Table caption.</caption>
     <tbody>
       <tr class="rowClass1">
-        <th class="headingClass1" ezxhtml:width="102" valign="top" colspan="1" rowspan="5" abbr="XSLT" scope="col">11</th>
+        <th class="headingClass1" ezxhtml:width="102" valign="top" colspan="1" rowspan="5" abbr="XSLT" scope="col">11
+with some line break</th>
         <th class="headingClass2" ezxhtml:width="37%" valign="middle" colspan="2" rowspan="6" abbr="XSD" scope="row">12</th>
       </tr>
       <tr class="rowClass2">
-        <td class="cellClass1" ezxhtml:width="74%" valign="bottom" colspan="3" rowspan="7">21</td>
+        <td class="cellClass1" ezxhtml:width="74%" valign="bottom" colspan="3" rowspan="7">21
+with some line break</td>
         <td class="cellClass2" ezxhtml:width="38" valign="baseline" colspan="4" rowspan="8">22</td>
       </tr>
     </tbody>

diff --git a/...lish/Core/FieldType/Tests/RichText/Converter/Xslt/_fixtures/ezxml/018-htmlTable.lossy.xml b/...lish/Core/FieldType/Tests/RichText/Converter/Xslt/_fixtures/ezxml/018-htmlTable.lossy.xml
@@ -19,15 +19,17 @@ the same as a original.
     <table class="tableClass" width="24%" border="0" custom:summary="tableTitle" custom:caption="Table caption.">
       <tr class="rowClass1">
         <th class="headingClass1" xhtml:width="102" custom:valign="top" xhtml:colspan="1" xhtml:rowspan="5" custom:abbr="XSLT" custom:scope="col">
-          <paragraph>11</paragraph>
+          <paragraph>11
+with some line break</paragraph>
         </th>
         <th class="headingClass2" xhtml:width="37%" custom:valign="middle" xhtml:colspan="2" xhtml:rowspan="6" custom:abbr="XSD" custom:scope="row">
           <paragraph>12</paragraph>
         </th>
       </tr>
       <tr class="rowClass2">
         <td class="cellClass1" xhtml:width="74%" custom:valign="bottom" xhtml:colspan="3" xhtml:rowspan="7">
-          <paragraph>21</paragraph>
+          <paragraph>21
+with some line break</paragraph>
         </td>
         <td class="cellClass2" xhtml:width="38" custom:valign="baseline" xhtml:colspan="4" xhtml:rowspan="8">
           <paragraph>22</paragraph>

diff --git a/...lish/Core/FieldType/Tests/RichText/Converter/Xslt/_fixtures/xhtml5/edit/018-htmlTable.xml b/...lish/Core/FieldType/Tests/RichText/Converter/Xslt/_fixtures/xhtml5/edit/018-htmlTable.xml
@@ -4,11 +4,11 @@
     <caption>Table caption.</caption>
     <tbody>
       <tr class="rowClass1">
-        <th class="headingClass1" colspan="1" rowspan="5" abbr="XSLT" scope="col" style="width:102px;vertical-align:top;">11</th>
+        <th class="headingClass1" colspan="1" rowspan="5" abbr="XSLT" scope="col" style="width:102px;vertical-align:top;">11<br/>with some line break</th>
         <th class="headingClass2" colspan="2" rowspan="6" abbr="XSD" scope="row" style="width:37%;vertical-align:middle;">12</th>
       </tr>
       <tr class="rowClass2">
-        <td class="cellClass1" colspan="3" rowspan="7" style="width:74%;vertical-align:bottom;">21</td>
+        <td class="cellClass1" colspan="3" rowspan="7" style="width:74%;vertical-align:bottom;">21<br/>with some line break</td>
         <td class="cellClass2" colspan="4" rowspan="8" style="width:38px;vertical-align:baseline;">22</td>
       </tr>
     </tbody>

diff --git a/...sh/Core/FieldType/Tests/RichText/Converter/Xslt/_fixtures/xhtml5/output/018-htmlTable.xml b/...sh/Core/FieldType/Tests/RichText/Converter/Xslt/_fixtures/xhtml5/output/018-htmlTable.xml
@@ -4,11 +4,11 @@
     <caption>Table caption.</caption>
     <tbody>
       <tr class="rowClass1">
-        <th class="headingClass1" colspan="1" rowspan="5" abbr="XSLT" scope="col" style="width:102px;vertical-align:top;">11</th>
+        <th class="headingClass1" colspan="1" rowspan="5" abbr="XSLT" scope="col" style="width:102px;vertical-align:top;">11<br/>with some line break</th>
         <th class="headingClass2" colspan="2" rowspan="6" abbr="XSD" scope="row" style="width:37%;vertical-align:middle;">12</th>
       </tr>
       <tr class="rowClass2">
-        <td class="cellClass1" colspan="3" rowspan="7" style="width:74%;vertical-align:bottom;">21</td>
+        <td class="cellClass1" colspan="3" rowspan="7" style="width:74%;vertical-align:bottom;">21<br/>with some line break</td>
         <td class="cellClass2" colspan="4" rowspan="8" style="width:38px;vertical-align:baseline;">22</td>
       </tr>
     </tbody>