Skip to content

Commit

Permalink
Merge pull request INTER-Mediator#1857 from msyk/master
Browse files Browse the repository at this point in the history
Wrong spelling instanciate are changed to instantiate.
  • Loading branch information
matsuo authored Feb 4, 2024
2 parents f686dca + 3fee654 commit b67e568
Show file tree
Hide file tree
Showing 27 changed files with 1,638 additions and 1,524 deletions.
763 changes: 386 additions & 377 deletions composer.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist-docs/change_log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Ver.12 (In Development)
browser local date and time.
- [BUG FIX] Fix an error when using PHP 8.3.0 or later / PHP 8.1.25 / PHP 8.2.12 and $appLocale is undefined in
params.php.
- [BUG FIX] Wrong spelling instanciate are changed to instantiate.

Ver.11 (July 27, 2023)
- Generic exporting class prepared as DB\Export.php.
Expand Down
259 changes: 130 additions & 129 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@
"cors": "*",
"express": "*",
"nodemon": ">=3.0.2",
"inter-mediator-expressionparser": "1.0.24",
"inter-mediator-expressionparser": "1.1.0",
"inter-mediator-formatter": "1.0.19",
"inter-mediator-locale": "1.0.4",
"inter-mediator-nodegraph": "1.0.6",
"inter-mediator-plugin-codemirror": "1.0.1",
"inter-mediator-plugin-flatpickr": "1.0.0",
"inter-mediator-plugin-jquerydatepicker": "1.0.2",
"inter-mediator-plugin-jqueryfileupload": "1.4.0",
"inter-mediator-plugin-jsonformatter": "1.0.0",
"inter-mediator-plugin-mermaid": "1.0.1",
"inter-mediator-plugin-popupselector": "1.0.1",
"inter-mediator-plugin-qrcode": "1.0.3",
"inter-mediator-plugin-tinymce": "1.1.0",
"inter-mediator-plugin-codemirror": "1.1.0",
"inter-mediator-plugin-flatpickr": "1.1.0",
"inter-mediator-plugin-jquerydatepicker": "1.1.0",
"inter-mediator-plugin-jqueryfileupload": "1.5.0",
"inter-mediator-plugin-jsonformatter": "1.1.0",
"inter-mediator-plugin-mermaid": "1.1.0",
"inter-mediator-plugin-popupselector": "1.1.0",
"inter-mediator-plugin-qrcode": "1.1.0",
"inter-mediator-plugin-tinymce": "1.2.0",
"inter-mediator-queue": "1.0.9",
"jssha": ">=3.0.0",
"npm-platform-dependencies": "*",
Expand Down
70 changes: 35 additions & 35 deletions params.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,26 @@
//$dbPassword = 'l{OVBu":DoX#D,+\hu*S';

//$activateGenerator = true;
$generatorUser = $dbUser;
$generatorPassword = $dbPassword;
$generatorOptions = [
'default-type' => "TEXT",
'pk-type' => 'INT NOT NULL AUTO_INCREMENT PRIMARY KEY',
'fk-type' => 'INT',
'datetime-suffix' => '_dt',
'date-suffix' => '_date',
'time-suffix' => '_time',
'int-suffix' => '_int',
'double-suffix' => '_double',
'text-suffix' => '_text',
'datetime-prefix' => 'dt_',
'date-prefix' => 'date_',
'time-prefix' => 'time_',
'int-prefix' => 'int_',
'double-prefix' => 'double_',
'text-prefix' => 'text_',
'dummy-table' => 'dummy'
];
//$generatorUser = $dbUser;
//$generatorPassword = $dbPassword;
//$generatorOptions = [
// 'default-type' => "TEXT",
// 'pk-type' => 'INT NOT NULL AUTO_INCREMENT PRIMARY KEY',
// 'fk-type' => 'INT',
// 'datetime-suffix' => '_dt',
// 'date-suffix' => '_date',
// 'time-suffix' => '_time',
// 'int-suffix' => '_int',
// 'double-suffix' => '_double',
// 'text-suffix' => '_text',
// 'datetime-prefix' => 'dt_',
// 'date-prefix' => 'date_',
// 'time-prefix' => 'time_',
// 'int-prefix' => 'int_',
// 'double-prefix' => 'double_',
// 'text-prefix' => 'text_',
// 'dummy-table' => 'dummy'
//];

/* Security
* ===================
Expand Down Expand Up @@ -120,27 +120,27 @@
/* Messaging Settings
* =================== */
// If you want to specify the smtp server info, set them below.
$sendMailSMTP = array(
'server' => 'msyk.sakura.ne.jp',
'port' => '587',
'username' => '[email protected]',
'password' => '*********',
);
//$sendMailSMTP = array(
// 'server' => 'msyk.sakura.ne.jp',
// 'port' => '587',
// 'username' => '[email protected]',
// 'password' => '*********',
//);
// $waitAfterMail = 20; // Wait after send email with smtp server. Unit is Millisecond.

// Sending email features compatibility with INTER-Mediator v5 unless 'template-context' key isn't specified.
$sendMailCompatibilityMode = false; // default is false (Until Ver.9 the default value was true.)
//$sendMailCompatibilityMode = false; // default is false (Until Ver.9 the default value was true.)

// Error/Warning/Debug messages can write to the PHP's error log. The default values are false
//$errorMessageLogging = false;
//$warningMessageLogging = true; // All messages are going to write error log.
//$debugMessageLogging = 'INTERMediator\DB'; // Messages from specified namespace are going to write error log.

// Slack posting token and channel. You must create the Slack App permitting 'chat:write:bot' and generate OAuth2 token.
$slackParameters = [
"token" => 'xoxp-XXXXXXXXXXX-XXXXXXXXXXX-XXXXXXXXXXXX-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
"channel" => 'message-posting-test',
];
//$slackParameters = [
// "token" => 'xoxp-XXXXXXXXXXX-XXXXXXXXXXX-XXXXXXXXXXXX-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
// "channel" => 'message-posting-test',
//];

/* Authorization
* =================== */
Expand Down Expand Up @@ -204,8 +204,8 @@
* ===================
* the table named 'operationlog' is required.
* The schema of the table describes in dist-docs/sample_schema_*.txt files. */
$accessLogLevel = true; // false: No logging, 1: without data, 2: with data

$accessLogLevel = false; // false: No logging, 1: without data, 2: with data
/*
$dbClassLog = $dbClass;
$dbDSNLog = $dbDSN;
$dbUserLog = $dbUser;
Expand All @@ -215,7 +215,7 @@
$dontRecordTheme = false;
$dontRecordChallenge = false;
$dontRecordDownload = false;
$dontRecordDownloadNoGet = false;
$dontRecordDownloadNoGet = false; */
//$accessLogExtensionClass = 'LoggingExt'; // Processing for some extending fields.

/* Media File Support
Expand Down Expand Up @@ -302,7 +302,7 @@
* field and value, but the string encoding is convert to sjis or ucs-4 and back to utf-8.
* As the default, the string is going to be encoded with the urlencode function.
*/
$uploadFilePathMode = "";
//$uploadFilePathMode = "";

/* Other settings
* =================== */
Expand Down
2 changes: 1 addition & 1 deletion spec/INTER-Mediator-UnitTest/Core/ServiceServer_Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class ServiceServer_Test extends TestCase
{

public function test_instanciate()
public function test_instantiate()
{
$ssProxy = ServiceServerProxy::instance();
$this->assertNotNull($ssProxy, "The ServiceServerProxy instance has to get.");
Expand Down
Loading

0 comments on commit b67e568

Please sign in to comment.