Skip to content

Commit c3cf92b

Browse files
jessevzgochujang-c
andauthored
Bug fixes in master into dev (#1137)
* FIXED error for unsupported php 8.4 in xdebug (#1134) * FIXED error for unsuported php 8.4 version by upgrading xdebug to version 3.4.0beta1 * temporarily fix by disabling php 8.4 deprecation warnings in apiv2 * Fixed preprocessor skip command bug. (#1126) * Fixed preprocessor skip command bug. * Added changelog entry. * Updated changelog entry version. * Use utf8mb4 as default encoding (#1127) * Use utf8mb4. * Added comment, added changelog entry. --------- Co-authored-by: jessevz <[email protected]> --------- Co-authored-by: gochujang-c <[email protected]>
1 parent fe16f39 commit c3cf92b

File tree

5 files changed

+18
-4
lines changed

5 files changed

+18
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ ENTRYPOINT [ "docker-entrypoint.sh" ]
9393
FROM hashtopolis-server-base as hashtopolis-server-dev
9494

9595
# Setting up development requirements, install xdebug
96-
RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \
96+
RUN yes | pecl install xdebug-3.4.0beta1 && docker-php-ext-enable xdebug \
9797
&& echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
9898
&& echo "xdebug.mode = debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
9999
&& echo "xdebug.start_with_request = yes" >> /usr/local/etc/php/conf.d/xdebug.ini \

doc/changelog.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# v0.14.3 -> v0.14.4
2+
3+
4+
## Enhancements
5+
6+
- Use utf8mb4 as default encoding in order to support the full unicode range
7+
8+
## Bugfixes
9+
10+
- Fixed a bug where creating a new preprocessor would copy the configured limit command over the configured skip command
11+
12+
113
# v0.14.2 -> v0.14.3
214

315
## Tech Preview New API

src/api/v2/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}
88

99
date_default_timezone_set("UTC");
10-
error_reporting(E_ALL);
10+
error_reporting(E_ALL ^ E_DEPRECATED);
1111
ini_set("display_errors", '1');
1212
/**
1313
* Treat warnings as error, very usefull during unit testing.

src/dba/AbstractModelFactory.class.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,9 @@ public function getDB($test = false) {
890890
}
891891
else {
892892
global $CONN;
893-
$dsn = 'mysql:dbname=' . $CONN['db'] . ";host=" . $CONN['server'] . ";port=" . $CONN['port'] . ";charset=utf8";
893+
// 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.
894+
// If you are running into issues with this line, we could make this configurable.
895+
$dsn = 'mysql:dbname=' . $CONN['db'] . ";host=" . $CONN['server'] . ";port=" . $CONN['port'] . ";charset=utf8mb4";
894896
$user = $CONN['user'];
895897
$password = $CONN['pass'];
896898
}

src/inc/utils/PreprocessorUtils.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public static function addPreprocessor($name, $binaryName, $url, $keyspaceComman
5454
$limitCommand = null;
5555
}
5656

57-
$preprocessor = new Preprocessor(null, $name, $url, $binaryName, $keyspaceCommand, $limitCommand, $limitCommand);
57+
$preprocessor = new Preprocessor(null, $name, $url, $binaryName, $keyspaceCommand, $skipCommand, $limitCommand);
5858
Factory::getPreprocessorFactory()->save($preprocessor);
5959
}
6060

0 commit comments

Comments
 (0)