Skip to content

Commit 2b01771

Browse files
gprolygproly
committed
FOUR-20506 Updated XML configuration to align with the latest schema. Migration was performed using the "--migrate-configuration" option to resolve validation issues with the deprecated schema.
1 parent 1e40e5f commit 2b01771

2 files changed

Lines changed: 56 additions & 65 deletions

File tree

‎ProcessMaker/Providers/ProcessMakerServiceProvider.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,6 @@ protected static function configureVendors(): void
269269
Horizon::auth(function ($request) {
270270
return Facades\Auth::user() instanceof Models\User;
271271
});
272-
273-
// we are using custom passport migrations
274-
//Passport::ignoreMigrations();
275272
}
276273

277274
private function setupFactories(): void

‎phpunit.xml‎

Lines changed: 56 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,74 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false"
3-
backupStaticAttributes="false"
43
colors="true"
5-
convertErrorsToExceptions="true"
6-
convertNoticesToExceptions="false"
7-
convertWarningsToExceptions="false"
84
processIsolation="false"
95
stopOnFailure="false"
106
bootstrap="tests/bootstrap.php"
117
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
128
>
13-
<testsuites>
14-
<testsuite name="Features">
15-
<directory>tests/Feature</directory>
16-
<directory>tests/Managers</directory>
17-
<directory>tests/Model</directory>
18-
<directory>tests/Resources</directory>
19-
<directory>tests/Sdk</directory>
20-
<directory>tests/Traits</directory>
21-
<directory>tests/unit</directory>
22-
</testsuite>
9+
<testsuites>
10+
<testsuite name="Features">
11+
<directory>tests/Feature</directory>
12+
<directory>tests/Managers</directory>
13+
<directory>tests/Model</directory>
14+
<directory>tests/Resources</directory>
15+
<directory>tests/Sdk</directory>
16+
<directory>tests/Traits</directory>
17+
<directory>tests/unit</directory>
18+
</testsuite>
2319
</testsuites>
20+
<php>
21+
<env name="APP_DEBUG" value="true" />
22+
<env name="APP_ENV" value="testing" />
23+
<env name="APP_URL" value="http://localhost" />
24+
<env name="TESTING_VERBOSE" value="false" />
25+
<env name="POPULATE_DATABASE" value="true" />
26+
<env name="TELESCOPE_ENABLED" value="false" />
27+
<env name="LOG_AUTH_EVENTS" value="false" />
28+
<env name="BROADCAST_DRIVER" value="log"/>
29+
<env name="SAVED_SEARCH_COUNT" value="false"/>
30+
<env name="SAVED_SEARCH_ADD_DEFAULTS" value="false"/>
31+
<env name="APP_CONFIG_CACHE" value="bootstrap/cache/config.test.php"/>
2432

25-
<coverage includeUncoveredFiles="true" processUncoveredFiles="false">
26-
<include>
27-
<directory suffix=".php">./ProcessMaker</directory>
28-
</include>
29-
</coverage>
30-
31-
<php>
32-
<env name="APP_DEBUG" value="true" />
33-
<env name="APP_ENV" value="testing" />
34-
<env name="APP_URL" value="http://localhost" />
35-
<env name="TESTING_VERBOSE" value="false" />
36-
<env name="POPULATE_DATABASE" value="true" />
37-
<env name="TELESCOPE_ENABLED" value="false" />
38-
<env name="LOG_AUTH_EVENTS" value="false" />
39-
<env name="BROADCAST_DRIVER" value="log"/>
40-
<env name="SAVED_SEARCH_COUNT" value="false"/>
41-
<env name="SAVED_SEARCH_ADD_DEFAULTS" value="false"/>
42-
<env name="APP_CONFIG_CACHE" value="bootstrap/cache/config.test.php"/>
33+
<!-- Caching config -->
34+
<env name="CACHE_DRIVER" value="array" />
35+
<env name="QUEUE_DRIVER" value="sync" />
36+
<env name="MESSAGE_BROKER_DRIVER" value="default" />
4337

44-
<!-- Caching config -->
45-
<env name="CACHE_DRIVER" value="array" />
46-
<env name="QUEUE_DRIVER" value="sync" />
47-
<env name="MESSAGE_BROKER_DRIVER" value="default" />
38+
<!-- Workflow Database -->
39+
<env name="DB_ADAPTER" value="mysql" />
40+
<env name="DB_DATABASE" value="test" />
41+
<env name="DATA_DB_DATABASE" value="test" />
42+
<env name="DB_TIMEZONE" value="+00:00" />
43+
<env name="DATA_DB_TIMEZONE" value="+00:00" />
44+
<env name="NAYRA_DOCKER_NETWORK" value="pm4-tools_default" />
4845

49-
<!-- Workflow Database -->
50-
<env name="DB_ADAPTER" value="mysql" />
51-
<env name="DB_DATABASE" value="test" />
52-
<env name="DATA_DB_DATABASE" value="test" />
53-
<env name="DB_TIMEZONE" value="+00:00" />
54-
<env name="DATA_DB_TIMEZONE" value="+00:00" />
55-
<env name="NAYRA_DOCKER_NETWORK" value="pm4-tools_default" />
46+
<!-- Log config -->
47+
<env name="LOG_CHANNEL" value="test" />
5648

57-
<!-- Log config -->
58-
<env name="LOG_CHANNEL" value="test" />
49+
<!-- MS Sql server -->
50+
<env name="RUN_MSSQL_TESTS" value="false" />
51+
<env name="MSSQL_HOST" value="172.16.3.1" />
52+
<env name="MSSQL_PORT" value="1433" />
53+
<env name="MSSQL_DATABASE" value="testexternal" />
54+
<env name="MSSQL_USERNAME" value="test" />
55+
<env name="MSSQL_PASSWORD" value="test" />
5956

60-
<!-- MS Sql server -->
61-
<env name="RUN_MSSQL_TESTS" value="false" />
62-
<env name="MSSQL_HOST" value="172.16.3.1" />
63-
<env name="MSSQL_PORT" value="1433" />
64-
<env name="MSSQL_DATABASE" value="testexternal" />
65-
<env name="MSSQL_USERNAME" value="test" />
66-
<env name="MSSQL_PASSWORD" value="test" />
57+
<env name="KEYS_PATH" value="tests/storage/keys" />
58+
<env name="MAILTEMPLATES_PATH" value="tests/storage/mailTemplates" />
59+
<env name="SKINS_PATH" value="tests/storage/skins" />
6760

68-
<env name="KEYS_PATH" value="tests/storage/keys" />
69-
<env name="MAILTEMPLATES_PATH" value="tests/storage/mailTemplates" />
70-
<env name="SKINS_PATH" value="tests/storage/skins" />
61+
<env name="THEMES_CACHE" value="false" />
62+
<env name="SESSION_SECURE_COOKIE" value="true" />
7163

72-
<env name="THEMES_CACHE" value="false" />
73-
<env name="SESSION_SECURE_COOKIE" value="true" />
64+
<env name="PRODUCT_ANALYTICS_ENABLED" value="false" />
65+
<env name="PRODUCT_ANALYTICS_INTERCOM_ENABLED" value="false" />
7466

75-
<env name="PRODUCT_ANALYTICS_ENABLED" value="false" />
76-
<env name="PRODUCT_ANALYTICS_INTERCOM_ENABLED" value="false" />
77-
78-
<env name="ENCRYPTED_DATA_KEY" value="base64:3/FNiukohihPSwmkzIl1csZIT6W4LYtnJzLPkNPjZgs=" />
79-
</php>
67+
<env name="ENCRYPTED_DATA_KEY" value="base64:3/FNiukohihPSwmkzIl1csZIT6W4LYtnJzLPkNPjZgs=" />
68+
</php>
69+
<source>
70+
<include>
71+
<directory suffix=".php">./ProcessMaker</directory>
72+
</include>
73+
</source>
8074
</phpunit>

0 commit comments

Comments
 (0)