1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 21:22:40 +00:00

More Linux/macOS fixes

- avoid iconv for now; causes problems with a nil-config server
- Set executable bit on Unix test runner
This commit is contained in:
J. King 2017-05-21 22:20:21 -04:00
parent adfb22e922
commit 757f2af343
4 changed files with 3 additions and 6 deletions

View file

@ -10,4 +10,3 @@ if(!defined(NS_BASE."INSTALL")) define(NS_BASE."INSTALL", false);
require_once BASE."vendor".DIRECTORY_SEPARATOR."autoload.php"; require_once BASE."vendor".DIRECTORY_SEPARATOR."autoload.php";
ignore_user_abort(true); ignore_user_abort(true);
iconv_set_encoding("internal_encoding", "UTF-8");

View file

@ -20,7 +20,6 @@
"require": { "require": {
"php": "^7.0", "php": "^7.0",
"ext-intl": "*", "ext-intl": "*",
"ext-iconv": "*",
"fguillot/picofeed": ">=0.1.31", "fguillot/picofeed": ">=0.1.31",
"jkingweb/druuid": "^3.0.0", "jkingweb/druuid": "^3.0.0",
"phpseclib/phpseclib": "^2.0.4", "phpseclib/phpseclib": "^2.0.4",

5
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "3fce3392b0a38874ae31bb602f46c33b", "content-hash": "cd32c438fa1e530cc51e9ba5b608123c",
"packages": [ "packages": [
{ {
"name": "fguillot/picofeed", "name": "fguillot/picofeed",
@ -1787,8 +1787,7 @@
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": "^7.0", "php": "^7.0",
"ext-intl": "*", "ext-intl": "*"
"ext-iconv": "*"
}, },
"platform-dev": [] "platform-dev": []
} }

0
tests/test Normal file → Executable file
View file