Merge pull request #6 from Aplia/feature/2019.03.4.merge

Feature/2019.03.4.merge

autoload/ezp_kernel.php

@@ -176,6 +176,7 @@
       'eZExtensionPackageHandler'                          => 'kernel/classes/packagehandlers/ezextension/ezextensionpackagehandler.php',
       'eZFSFileHandler'                                    => 'kernel/classes/clusterfilehandlers/ezfsfilehandler.php',
       'eZFile'                                             => 'lib/ezfile/classes/ezfile.php',
+      'eZFileExtensionBlackListValidator'                  => 'lib/ezutils/classes/ezfileextensionblacklistvalidator.php',
       'eZFileHandler'                                      => 'lib/ezfile/classes/ezfilehandler.php',
       'eZFilePackageHandler'                               => 'kernel/classes/packagehandlers/ezfile/ezfilepackagehandler.php',
       'eZFilePassthroughHandler'                           => 'kernel/classes/binaryhandlers/ezfilepassthrough/ezfilepassthroughhandler.php',

design/admin/templates/content/datatype/view/ezxmltags/literal.tpl

@@ -0,0 +1 @@
+{* Do not output literal HTML in the Administration Interface *}<pre{if ne($classification|trim,'')} class="{$classification|wash}"{/if}>{$content|wash(xhtml)}</pre>

doc/bc/5.90/php7.md

@@ -1,13 +1,19 @@
 # PHP 7 support
 
+## PHP 7.0 support
 
 For the [2017.10 release](https://github.com/ezsystems/ezpublish-legacy/releases/tag/v2017.10.0),
-eZ Publish recived changes to switch to PHP 5 style constuctors all over the code base.
+eZ Publish received changes all over the code base, switching object constructor methods to PHP 5 style.
 
-Reason is to reach full PHP 7 support by avoiding deprecation warnings for still using PHP 4
+The reason is to achieve full PHP 7.0 support by avoiding the deprecation warnings when using PHP 4
 style constructors.
 
-Here is an example of how you might need to adapt for this change in your code:
+Care has been taken to keep around compatibility functions in all known cases to avoid fatal errors
+for custom extensions, however to avoid warnings you might need to adapt your code as well.
+
+Common cases are classes extending `eZPersistentObject` or `eZDataType`.
+
+Here is an example of how you should adapt your code for the constructor change:
 
 ```diff
 diff --git a/classes/ezfindresultnode.php b/classes/ezfindresultnode.php
@@ -25,29 +31,44 @@ index fafca310..b6462159 100644
              $this->ContentObjectID = $rows['id'];
 ```
 
-Other more common examples are classes extending `eZPersistentObject` or `eZDataType`.
+For best results you should also consider changing your own code to use PHP 5 style constructors.
+In the example above that would mean renaming `function eZFindResultNode` to `function __construct` and,
+if you think that other code might exist which extends the `eZFindResultNode` class, add back a courtesy 
+`eZFindResultNode` function that does nothing but call `__construct`
+
+Further reading:
+- http://php.net/manual/en/language.oop5.decon.php
+- https://www.php.net/manual/en/migration70.incompatible.php
+- https://www.php.net/manual/en/migration71.incompatible.php
+
+## PHP 7.2 support
+
+Starting with the 2019.03 release, issues happening on PHP 7.2 and PHP 7.3 have been fixed, but in your own code you'll
+also need to handle some of those.
 
-You should also consider changing your own code to use PHP 5 style constructor while doing this,
-in example above that would imply changing `function eZFindResultNode` to `function __construct`.
+Most notable is the `Warn when counting non-countable types` change, added in PHP 7.2.
 
-Further reading: http://php.net/manual/en/language.oop5.decon.phpi
+To handle this across all supported PHP versions, we introduced use of [symfony/polyfill-php73](https://github.com/symfony/polyfill-php73)
+package, witch backports PHP 7.3's function [is_countable](https://www.php.net/is_countable).
 
+Here is an example of changes you might need to apply in your own code to work around that:
 
-Note: You should also increase requriment for ezplublish-legacy once the above changes are done like following example:
 ```diff
-diff --git a/composer.json b/composer.json
-index de225eb1..d0389c6d 100644
---- a/composer.json
-+++ b/composer.json
-@@ -11,7 +11,8 @@
-     ],
-     "minimum-stability": "dev",
-     "require": {
--        "ezsystems/ezpublish-legacy-installer": "*"
-+        "ezsystems/ezpublish-legacy-installer": "*",
-+        "ezsystems/ezpublish-legacy": ">=2017.10"
-     },
-     "extra": {
-         "ezpublish-legacy-extension-name": "ezfind"
+diff --git a/kernel/common/eztemplatedesignresource.php b/kernel/common/eztemplatedesignresource.php
+index b0fc28faa9a..9b8ca2a8d94 100644
+--- a/kernel/common/eztemplatedesignresource.php
++++ b/kernel/common/eztemplatedesignresource.php
+@@ -86,7 +86,7 @@ function templateNodeTransformation( $functionName, &$node,
+                 $matchCount = 0;
+                 foreach ( $customMatchList as $customMatch )
+                 {
+-                    $matchConditionCount = count( $customMatch['conditions'] );
++                    $matchConditionCount = is_countable( $customMatch['conditions'] ) ? count( $customMatch['conditions'] ) : 0;
+                     $code = '';
+                     if ( $matchCount > 0 )
+                     {
 ```
 
+Further reading:
+- https://www.php.net/manual/en/migration72.incompatible.php
+- https://www.php.net/manual/en/migration73.incompatible.php