From 757f2af343105a20ce1c8d9546a615356c060048 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Sun, 21 May 2017 22:20:21 -0400
Subject: [PATCH] More Linux/macOS fixes

- avoid iconv for now; causes problems with a nil-config server
- Set executable bit on Unix test runner
---
 bootstrap.php | 3 +--
 composer.json | 1 -
 composer.lock | 5 ++---
 tests/test    | 0
 4 files changed, 3 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 tests/test

diff --git a/bootstrap.php b/bootstrap.php
index 9fdf627f..5802d7a4 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -9,5 +9,4 @@ const VERSION = "0.0.0";
 if(!defined(NS_BASE."INSTALL")) define(NS_BASE."INSTALL", false);
 
 require_once BASE."vendor".DIRECTORY_SEPARATOR."autoload.php";
-ignore_user_abort(true);
-iconv_set_encoding("internal_encoding", "UTF-8");
\ No newline at end of file
+ignore_user_abort(true);
\ No newline at end of file
diff --git a/composer.json b/composer.json
index d732506d..f1ef70e5 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,6 @@
     "require": {
         "php": "^7.0",
         "ext-intl": "*",
-        "ext-iconv": "*",
         "fguillot/picofeed": ">=0.1.31",
         "jkingweb/druuid": "^3.0.0",
         "phpseclib/phpseclib": "^2.0.4",
diff --git a/composer.lock b/composer.lock
index 14a02683..945279b9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "3fce3392b0a38874ae31bb602f46c33b",
+    "content-hash": "cd32c438fa1e530cc51e9ba5b608123c",
     "packages": [
         {
             "name": "fguillot/picofeed",
@@ -1787,8 +1787,7 @@
     "prefer-lowest": false,
     "platform": {
         "php": "^7.0",
-        "ext-intl": "*",
-        "ext-iconv": "*"
+        "ext-intl": "*"
     },
     "platform-dev": []
 }
diff --git a/tests/test b/tests/test
old mode 100644
new mode 100755