Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / vendor / psy / psysh / src / Util / Json.php

diff --git a/vendor/psy/psysh/src/Psy/Util/Json.php b/vendor/psy/psysh/src/Util/Json.php
similarity index 76%
rename from vendor/psy/psysh/src/Psy/Util/Json.php
rename to vendor/psy/psysh/src/Util/Json.php
index 352e8456b554c230b232b19bed6b1772f1fb86fd..54ccf313444340042390cdcaca6fb91c83366d1f 100644 (file)
--- a/vendor/psy/psysh/src/Psy/Util/Json.php
+++ b/vendor/psy/psysh/src/Util/Json.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2017 Justin Hileman
+ * (c) 2012-2018 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -26,9 +26,7 @@ class Json
      */
     public static function encode($val, $opt = 0)
     {
-        if (version_compare(PHP_VERSION, '5.4', '>=')) {
-            $opt |= JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
-        }
+        $opt |= JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
 
         return json_encode($val, $opt);
     }