diff --git a/Dockerfile b/Dockerfile index bcea9c17..6828f40b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,7 +93,7 @@ ENTRYPOINT [ "docker-entrypoint.sh" ] FROM hashtopolis-server-base as hashtopolis-server-dev # Setting up development requirements, install xdebug -RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \ +RUN yes | pecl install xdebug-3.4.0beta1 && docker-php-ext-enable xdebug \ && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.mode = debug" >> /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.start_with_request = yes" >> /usr/local/etc/php/conf.d/xdebug.ini \ diff --git a/doc/changelog.md b/doc/changelog.md index ae76dbe5..182ebba6 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,3 +1,15 @@ +# v0.14.3 -> v0.14.4 + + +## Enhancements + +- Use utf8mb4 as default encoding in order to support the full unicode range + +## Bugfixes + +- Fixed a bug where creating a new preprocessor would copy the configured limit command over the configured skip command + + # v0.14.2 -> v0.14.3 ## Tech Preview New API diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 21debec7..ea89c1d6 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -7,7 +7,7 @@ } date_default_timezone_set("UTC"); -error_reporting(E_ALL); +error_reporting(E_ALL ^ E_DEPRECATED); ini_set("display_errors", '1'); /** * Treat warnings as error, very usefull during unit testing. diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 8eb63ba9..1a0612a0 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -890,7 +890,9 @@ public function getDB($test = false) { } else { global $CONN; - $dsn = 'mysql:dbname=' . $CONN['db'] . ";host=" . $CONN['server'] . ";port=" . $CONN['port'] . ";charset=utf8"; + // The utf8mb4 is here to force php to connect with that encoding, so you can save emoji's or other non ascii chars (specifically, unicode characters outside of the BMP) into the database. + // If you are running into issues with this line, we could make this configurable. + $dsn = 'mysql:dbname=' . $CONN['db'] . ";host=" . $CONN['server'] . ";port=" . $CONN['port'] . ";charset=utf8mb4"; $user = $CONN['user']; $password = $CONN['pass']; } diff --git a/src/inc/utils/PreprocessorUtils.class.php b/src/inc/utils/PreprocessorUtils.class.php index ed8fab31..75fda032 100644 --- a/src/inc/utils/PreprocessorUtils.class.php +++ b/src/inc/utils/PreprocessorUtils.class.php @@ -54,7 +54,7 @@ public static function addPreprocessor($name, $binaryName, $url, $keyspaceComman $limitCommand = null; } - $preprocessor = new Preprocessor(null, $name, $url, $binaryName, $keyspaceCommand, $limitCommand, $limitCommand); + $preprocessor = new Preprocessor(null, $name, $url, $binaryName, $keyspaceCommand, $skipCommand, $limitCommand); Factory::getPreprocessorFactory()->save($preprocessor); }