Merge branch '4.4-dev' into upmerge

Author: laoneo

administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php

@@ -118,7 +118,7 @@ public function check()
             $this->metadesc = StringHelper::str_ireplace($bad_characters, '', $this->metadesc);
         }
 
-        if (is_null($this->hits)) {
+        if (!$this->hits) {
             $this->hits = 0;
         }
 

composer.json

@@ -67,7 +67,7 @@
         "joomla/uri": "~3.0.x-dev",
         "joomla/utilities": "~3.0.x-dev",
         "algo26-matthias/idna-convert": "^3.1.0",
-        "defuse/php-encryption": "^2.3.1",
+        "defuse/php-encryption": "^2.4.0",
         "doctrine/inflector": "^1.4.4",
         "fig/link-util": "^1.2.0",
         "google/recaptcha": "^1.3.0",

composer.lock

@@ -68,6 +68,38 @@ class FeedLink
      */
     public $length;
 
+    /**
+     * The link of the image.
+     *
+     * @var    integer
+     * @since  __DEPLOY_VERSION__
+     */
+    public $link;
+
+    /**
+     * The description of the image.
+     *
+     * @var    integer
+     * @since  __DEPLOY_VERSION__
+     */
+    public $description;
+
+    /**
+     * The height of the image.
+     *
+     * @var    integer
+     * @since  __DEPLOY_VERSION__
+     */
+    public $height;
+
+    /**
+     * The width of the image.
+     *
+     * @var    integer
+     * @since  __DEPLOY_VERSION__
+     */
+    public $width;
+
     /**
      * Constructor.
      *

libraries/src/Feed/FeedLink.php

@@ -195,6 +195,11 @@ public static function urlToUTF8($uri)
      */
     public static function emailToPunycode($email)
     {
+        if ($email === null) {
+            @trigger_error(sprintf('Passing null value is deprecated in %s and will throw an exception in 6.0.', __METHOD__), E_USER_DEPRECATED);
+            return '';
+        }
+
         $explodedAddress = explode('@', $email);
 
         // Not addressing UTF-8 user names