From 118a665cb60c4b05060f90d447ceb5ef2907bfd2 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 20 Feb 2019 18:33:09 +0100
Subject: [PATCH] wip #2602 @0.25

---
 .gitignore                   |  4 +++-
 composer.json                |  6 +++--
 src/Cubist/Util/Json.php     | 45 ++++++++++++++++++++++++++++++++++++
 src/Cubist/Util/WebVideo.php |  4 ++--
 4 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 src/Cubist/Util/Json.php

diff --git a/.gitignore b/.gitignore
index 723ef36..8925195 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-.idea
\ No newline at end of file
+.idea
+vendor
+composer.lock
\ No newline at end of file
diff --git a/composer.json b/composer.json
index f3c69ef..a20fedc 100644
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,8 @@
     "ext-dom": "*",
     "ext-simplexml": "*",
     "ext-json": "*",
-    "ext-iconv": "*"
+    "ext-iconv": "*",
+    "zendframework/zend-filter": "^2.9@dev",
+    "zendframework/zend-json": "^3.1@dev"
   }
-}
\ No newline at end of file
+}
diff --git a/src/Cubist/Util/Json.php b/src/Cubist/Util/Json.php
new file mode 100644
index 0000000..644455a
--- /dev/null
+++ b/src/Cubist/Util/Json.php
@@ -0,0 +1,45 @@
+<?php
+namespace Cubist\Util;
+
+class Json extends \Zend\Json\Json
+{
+	/**
+	 *
+	 * @param mixed $v
+	 * @return boolean
+	 */
+	public static function isJson($v)
+	{
+		if (!is_string($v)) {
+			return false;
+		}
+
+		$v = trim($v);
+
+		$firstchar = mb_substr($v, 0, 1);
+		$lastchar = mb_substr($v, -1);
+		return (($firstchar == '[' && $lastchar == ']') || ($firstchar == '{' && $lastchar == '}'));
+	}
+
+	public static function decode($encodedValue, $objectDecodeType = \Zend\Json\Json::TYPE_OBJECT)
+	{
+		if ((is_array($encodedValue) && $objectDecodeType == \Zend\Json\Json::TYPE_ARRAY) ||
+			(is_object($encodedValue) && $objectDecodeType == \Zend\Json\Json::TYPE_OBJECT)
+		) {
+			return $encodedValue;
+		} else if (is_array($encodedValue) || is_object($encodedValue)) {
+			$encodedValue = self::encode($encodedValue);
+		}
+		try {
+			return parent::decode($encodedValue, $objectDecodeType);
+		} catch (\Exception $e) {
+			return null;
+		}
+	}
+
+	public static function encode($valueToEncode, $cycleCheck = false, array $options = [])
+	{
+		return parent::encode($valueToEncode, $cycleCheck, $options);
+	}
+
+}
\ No newline at end of file
diff --git a/src/Cubist/Util/WebVideo.php b/src/Cubist/Util/WebVideo.php
index 0f9c1e8..ae09523 100644
--- a/src/Cubist/Util/WebVideo.php
+++ b/src/Cubist/Util/WebVideo.php
@@ -29,7 +29,7 @@ class WebVideo {
 
 		$s = CubeIT_Text::ucfirst($service, true);
 		$f = '_get' . $s . 'Url';
-		$refl = new ReflectionClass(get_class());
+		$refl = new \ReflectionClass(get_class());
 		if (!$refl->hasMethod($f)) {
 			return false;
 		}
@@ -37,7 +37,7 @@ class WebVideo {
 	}
 
 	protected static function _getGenericUrl($url) {
-		$meta = CubeIT_Util_Html::getMicrodata($url);
+		$meta = Html::getMicrodata($url);
 
 		$res = '';
 		foreach ($meta->getElementsByTagName('*') as $m) {
-- 
2.39.5