Commit 5b636287 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Fixed some php unit tests

parent e06283ee
...@@ -381,7 +381,7 @@ config.qfq.ini ...@@ -381,7 +381,7 @@ config.qfq.ini
+-----------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+ +-----------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| thumbnailDirSecure | thumbnailDirSecure = fileadmin/protected/qfqThumbnail | Important: secure this directory against direct access. | | thumbnailDirSecure | thumbnailDirSecure = fileadmin/protected/qfqThumbnail | Important: secure this directory against direct access. |
| thumbnailDirPublic | thumbnailDirPublic = typo3temp/qfqThumbnail | Both thumbnail directories will be created if not existing. | | thumbnailDirPublic | thumbnailDirPublic = typo3temp/qfqThumbnail | Both thumbnail directories will be created if not existing. |
| cmdInkscape | cmdInkscape = inkscape | If inkscape is not available, specify an empty string. | | cmdInkscape | cmdInkscape = inkscape | If inkscape is not available, specify an empty string. |
| cmdConvert | cmdConvert = convert | GraphicsMagics 'convert' is recommended. | | cmdConvert | cmdConvert = convert | GraphicsMagics 'convert' is recommended. |
+-----------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+ +-----------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
......
...@@ -166,7 +166,6 @@ class Config { ...@@ -166,7 +166,6 @@ class Config {
SYSTEM_SHOW_DEBUG_INFO => SYSTEM_SHOW_DEBUG_INFO_AUTO, SYSTEM_SHOW_DEBUG_INFO => SYSTEM_SHOW_DEBUG_INFO_AUTO,
SYSTEM_SQL_LOG => SYSTEM_SQL_LOG_FILE, SYSTEM_SQL_LOG => SYSTEM_SQL_LOG_FILE,
SYSTEM_SQL_LOG_MODE => 'modify', SYSTEM_SQL_LOG_MODE => 'modify',
SQL_LOG_MODE_NONE => '',
SYSTEM_MAIL_LOG => SYSTEM_MAIL_LOG_FILE, SYSTEM_MAIL_LOG => SYSTEM_MAIL_LOG_FILE,
F_BS_COLUMNS => '12', F_BS_COLUMNS => '12',
F_BS_LABEL_COLUMNS => '3', F_BS_LABEL_COLUMNS => '3',
...@@ -200,7 +199,7 @@ class Config { ...@@ -200,7 +199,7 @@ class Config {
F_BUTTON_ON_CHANGE_CLASS => 'btn-info alert-info', F_BUTTON_ON_CHANGE_CLASS => 'btn-info alert-info',
SYSTEM_EDIT_FORM_PAGE => 'form', SYSTEM_EDIT_FORM_PAGE => 'form',
SYSTEM_SECURITY_VARS_HONEYPOT => 'email=>username=>password', SYSTEM_SECURITY_VARS_HONEYPOT => 'email,username,password',
SYSTEM_SECURITY_ATTACK_DELAY => SYSTEM_SECURITY_ATTACK_DELAY_DEFAULT, SYSTEM_SECURITY_ATTACK_DELAY => SYSTEM_SECURITY_ATTACK_DELAY_DEFAULT,
SYSTEM_SECURITY_SHOW_MESSAGE => '0', SYSTEM_SECURITY_SHOW_MESSAGE => '0',
SYSTEM_SECURITY_GET_MAX_LENGTH => SYSTEM_SECURITY_GET_MAX_LENGTH_DEFAULT, SYSTEM_SECURITY_GET_MAX_LENGTH => SYSTEM_SECURITY_GET_MAX_LENGTH_DEFAULT,
......
...@@ -279,24 +279,21 @@ class StoreTest extends \PHPUnit_Framework_TestCase { ...@@ -279,24 +279,21 @@ class StoreTest extends \PHPUnit_Framework_TestCase {
EOT; EOT;
$expect = [ $expect = [
SYSTEM_DB_1_USER => '<DBUSER>',
SYSTEM_DB_1_SERVER => '<DBSERVER>',
SYSTEM_DB_1_PASSWORD => '<DBPW>',
SYSTEM_DB_1_NAME => '<DB>',
SYSTEM_DB_INIT => 'set names utf8',
SYSTEM_SQL_LOG_MODE => 'modify',
SYSTEM_DB_INDEX_DATA => '1', SYSTEM_DB_INDEX_DATA => '1',
SYSTEM_DB_INDEX_QFQ => '1', SYSTEM_DB_INDEX_QFQ => '1',
SYSTEM_DATE_FORMAT => 'yyyy-mm-dd', SYSTEM_DATE_FORMAT => 'yyyy-mm-dd',
SYSTEM_SHOW_DEBUG_INFO => SYSTEM_SHOW_DEBUG_INFO_AUTO, SYSTEM_SHOW_DEBUG_INFO => SYSTEM_SHOW_DEBUG_INFO_AUTO,
SYSTEM_SQL_LOG_MODE => 'modify',
F_BS_COLUMNS => '12', F_BS_COLUMNS => '12',
F_BS_LABEL_COLUMNS => '3', F_BS_LABEL_COLUMNS => '3',
F_BS_INPUT_COLUMNS => '6', F_BS_INPUT_COLUMNS => '6',
F_BS_NOTE_COLUMNS => '3', F_BS_NOTE_COLUMNS => '3',
SYSTEM_WKHTMLTOPDF => '/opt/wkhtmltox/bin/wkhtmltopdf',
F_CLASS_PILL => 'qfq-color-grey-1', F_CLASS_PILL => 'qfq-color-grey-1',
F_CLASS_BODY => 'qfq-color-grey-2', F_CLASS_BODY => 'qfq-color-grey-2',
...@@ -338,8 +335,16 @@ EOT; ...@@ -338,8 +335,16 @@ EOT;
SYSTEM_ENTER_AS_SUBMIT => 1, SYSTEM_ENTER_AS_SUBMIT => 1,
SYSTEM_CMD_INKSCAPE => 'inkscape', SYSTEM_CMD_INKSCAPE => 'inkscape',
SYSTEM_CMD_CONVERT => 'convert', SYSTEM_CMD_CONVERT => 'convert',
SYSTEM_THUMBNAIL_DIR_PUBLIC => SYSTEM_THUMBNAIL_DIR_PUBLIC_DEFAULT,
SYSTEM_THUMBNAIL_DIR_SECURE => SYSTEM_THUMBNAIL_DIR_SECURE_DEFAULT, SYSTEM_THUMBNAIL_DIR_SECURE => SYSTEM_THUMBNAIL_DIR_SECURE_DEFAULT,
SYSTEM_THUMBNAIL_DIR_PUBLIC => SYSTEM_THUMBNAIL_DIR_PUBLIC_DEFAULT,
SYSTEM_DB_1_USER => '<DBUSER>',
SYSTEM_DB_1_SERVER => '<DBSERVER>',
SYSTEM_DB_1_PASSWORD => '<DBPW>',
SYSTEM_DB_1_NAME => '<DB>',
SYSTEM_DB_INIT => 'set names utf8',
]; ];
$fileName = $this->createFile($body); $fileName = $this->createFile($body);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment