Merge branch 'master' into utf8mb4

Author: jessevz

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 \

doc/changelog.md

@@ -1,9 +1,14 @@
 # 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
 

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.

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);
   }