Skip to content

Commit 2b0c848

Browse files
author
CI bot
committed
Merge remote-tracking branch 'remotes/dev/master'
2 parents e5f2e0c + a284182 commit 2b0c848

File tree

18 files changed

+34
-23
lines changed

18 files changed

+34
-23
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
"Oro\\Component\\Testing\\": "src/Oro/Component/Testing",
324324
"Oro\\Component\\TestUtils\\": "src/Oro/Component/TestUtils"
325325
},
326-
"exclude-from-classmap": ["/Tests/"]
326+
"exclude-from-classmap": ["**/Tests/"]
327327
},
328328
"config": {
329329
"allow-plugins": {

dev.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326
"Oro\\Component\\TestUtils\\": "src/Oro/Component/TestUtils"
327327
},
328328
"exclude-from-classmap": [
329-
"/Tests/"
329+
"**/Tests/"
330330
]
331331
},
332332
"config": {

dev.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4952,7 +4952,7 @@
49524952
"dist": {
49534953
"type": "path",
49544954
"url": "../serialized-fields",
4955-
"reference": "1860365cfb616f5a7e778f0b2e3a540a379655e6"
4955+
"reference": "8d98313276b475bf46316a68bf561679c09187a4"
49564956
},
49574957
"require": {
49584958
"oro/platform": "6.1.*"
@@ -4968,7 +4968,7 @@
49684968
"Oro\\Bundle\\EntitySerializedFieldsBundle\\": ""
49694969
},
49704970
"exclude-from-classmap": [
4971-
"/Tests/"
4971+
"**/Tests/"
49724972
]
49734973
},
49744974
"license": [
@@ -5891,16 +5891,16 @@
58915891
},
58925892
{
58935893
"name": "phpstan/phpdoc-parser",
5894-
"version": "2.0.0",
5894+
"version": "2.1.0",
58955895
"source": {
58965896
"type": "git",
58975897
"url": "https://github.com/phpstan/phpdoc-parser.git",
5898-
"reference": "c00d78fb6b29658347f9d37ebe104bffadf36299"
5898+
"reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68"
58995899
},
59005900
"dist": {
59015901
"type": "zip",
5902-
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299",
5903-
"reference": "c00d78fb6b29658347f9d37ebe104bffadf36299",
5902+
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9b30d6fd026b2c132b3985ce6b23bec09ab3aa68",
5903+
"reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68",
59045904
"shasum": ""
59055905
},
59065906
"require": {
@@ -5932,9 +5932,9 @@
59325932
"description": "PHPDoc parser with support for nullable, intersection and generic types",
59335933
"support": {
59345934
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
5935-
"source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0"
5935+
"source": "https://github.com/phpstan/phpdoc-parser/tree/2.1.0"
59365936
},
5937-
"time": "2024-10-13T11:29:49+00:00"
5937+
"time": "2025-02-19T13:28:12+00:00"
59385938
},
59395939
{
59405940
"name": "predis/predis",

src/Oro/Bundle/EmailBundle/Sync/AbstractEmailSynchronizer.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,11 @@ protected function findOriginToSync(int $maxConcurrentTasks, int $minExecInterva
450450
. ' - (CASE o.syncCode WHEN :success THEN 0 ELSE :timeShift END)) AS HIDDEN p2'
451451
)
452452
->where('o.isActive = :isActive AND (o.syncCodeUpdatedAt IS NULL OR o.syncCodeUpdatedAt <= :border)')
453+
->andWhere('o.imapHost IS NOT NULL')
454+
->andWhere('o.imapPort > 0')
455+
->andWhere('o.user IS NOT NULL')
456+
->andWhere('o.password IS NOT NULL')
457+
->andWhere('o.accessToken IS NOT NULL')
453458
->andWhere('(o.isSyncEnabled is NULL or o.isSyncEnabled = :isSyncEnabled)')
454459
->orderBy('p1, p2 DESC, o.syncCodeUpdatedAt')
455460
->setParameter('inProcess', self::SYNC_CODE_IN_PROCESS)

src/Oro/Bundle/EmailBundle/Tests/Unit/Sync/AbstractEmailSynchronizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ public function testFindOriginToSync(): void
492492
$qb->expects(self::once())
493493
->method('leftJoin')
494494
->willReturnSelf();
495-
$qb->expects(self::exactly(2))
495+
$qb->expects(self::exactly(7))
496496
->method('andWhere')
497497
->willReturnSelf();
498498
$qb->expects(self::once())

src/Oro/Bundle/ImapBundle/Tests/Functional/Cron/ImapResponses/set#1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ log_info:
55
- 'Resetting hanged email origins ...'
66
- 'Updated 0 row(s).'
77
- 'Finding an email origin ...'
8-
- 'Found " ()" email origin. Id: '
8+
- 'Found "simple_user_enabled (imap.example.com)" email origin. Id: '
99
- 'Refresh the folders.'
1010
- 'Get folders enabled for sync...'
1111
- 'Got 0 folder(s)'

src/Oro/Bundle/ImapBundle/Tests/Functional/Cron/ImapResponses/set#10.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ params:
44
--id: origin_two
55
log_info:
66
- 'Finding an email origin (id:'
7-
- 'Found " ()" email origin. Id: '
7+
- 'Found "simple_user_enabled (imap.example.com)" email origin. Id: '
88
- 'Refresh the folders.'
99
- 'Get folders enabled for sync...'
1010
- 'Got 1 folder(s)'

src/Oro/Bundle/ImapBundle/Tests/Functional/Cron/ImapResponses/set#11.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ params:
44
--id: origin_two
55
log_info:
66
- 'Finding an email origin (id:'
7-
- 'Found " ()" email origin. Id: '
7+
- 'Found "simple_user_enabled (imap.example.com)" email origin. Id: '
88
- 'Refresh the folders.'
99
- 'Get folders enabled for sync...'
1010
- 'Got 1 folder(s)'

src/Oro/Bundle/ImapBundle/Tests/Functional/Cron/ImapResponses/set#12.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ params:
44
--id: origin_two
55
log_info:
66
- 'Finding an email origin (id:'
7-
- 'Found " ()" email origin. Id: '
7+
- 'Found "simple_user_enabled (imap.example.com)" email origin. Id: '
88
- 'Refresh the folders.'
99
- 'Get folders enabled for sync...'
1010
- 'Got 1 folder(s)'

src/Oro/Bundle/ImapBundle/Tests/Functional/Cron/ImapResponses/set#13.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ params:
44
--id: origin_two
55
log_info:
66
- 'Finding an email origin (id:'
7-
- 'Found " ()" email origin. Id: '
7+
- 'Found "simple_user_enabled (imap.example.com)" email origin. Id: '
88
- 'Refresh the folders.'
99
- 'Get folders enabled for sync...'
1010
- 'Got 1 folder(s)'

0 commit comments

Comments
 (0)