Skip to content

Commit 2f36ac8

Browse files
njoubert-cleveragenjoubert-cleverage
authored
Merge pull request #10 from cleverage/prepare-release-merge-v2-dev
Prepare release merge v2 dev
2 parents 363d204 + 8a9eaec commit 2f36ac8

File tree

110 files changed

+3401
-2095
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+3401
-2095
lines changed

‎composer.json

+6-21
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
"type": "symfony-bundle",
1515
"license": "MIT",
1616
"authors": [
17-
{
18-
"name": "Baudouin Douliery",
19-
"email": "[email protected]",
20-
"role": "Developer"
21-
},
2217
{
2318
"name": "Grégory Tonon",
2419
"email": "[email protected]",
@@ -41,7 +36,7 @@
4136
}
4237
},
4338
"require": {
44-
"php": ">=8.1",
39+
"php": ">=8.2",
4540
"ext-ctype": "*",
4641
"ext-iconv": "*",
4742
"cleverage/process-bundle": "dev-prepare-release",
@@ -50,24 +45,14 @@
5045
"doctrine/doctrine-bundle": "^2.5",
5146
"doctrine/doctrine-migrations-bundle": "^3.2",
5247
"doctrine/orm": "^2.9 || ^3.0",
53-
"easycorp/easyadmin-bundle": "^4.0",
54-
"league/flysystem": "^3.0",
48+
"easycorp/easyadmin-bundle": "^4.8",
5549
"symfony/doctrine-messenger": "^6.4|^7.1",
56-
"symfony/filesystem": "^6.4|^7.1",
57-
"symfony/form": "^6.4|^7.1",
58-
"symfony/framework-bundle": "^6.4|^7.1",
50+
"symfony/dotenv": "^6.4|^7.1",
5951
"symfony/messenger": "^6.4|^7.1",
60-
"symfony/mime": "^6.4|^7.1",
6152
"symfony/runtime": "^6.4|^7.1",
62-
"symfony/security-bundle": "^6.4|^7.1",
63-
"symfony/stopwatch": "^6.4|^7.1",
64-
"symfony/twig-bundle": "^6.4|^7.1",
65-
"symfony/validator": "^6.4|^7.1",
66-
"symfony/webpack-encore-bundle": "^1.13|^2.0",
67-
"symfony/yaml": "^6.4|^7.1",
68-
"syonix/monolog-parser": "dev-master",
69-
"twig/extra-bundle": "^3.8",
70-
"twig/intl-extra": "^3.8"
53+
"symfony/scheduler": "^6.4|^7.1",
54+
"symfony/string": "^6.4|^7.1",
55+
"symfony/uid": "^6.4|^7.1"
7156
},
7257
"require-dev": {
7358
"doctrine/doctrine-fixtures-bundle": "^3.4",

‎config/routes.yaml

-4
This file was deleted.

‎config/services/command.yaml

-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
services:
2-
cleverage_ui_process.command.purge_process_execution:
3-
class: CleverAge\ProcessUiBundle\Command\PurgeProcessExecution
4-
public: false
5-
tags:
6-
- { name: console.command }
7-
arguments:
8-
- '@cleverage_ui_process.repository.process_execution'
9-
- '%process_logs_dir%'
10-
112
cleverage_ui_process.command.user_create:
123
class: CleverAge\ProcessUiBundle\Command\UserCreateCommand
134
public: false

‎config/services/controller.yaml

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ services:
44
autowire: true
55
autoconfigure: true
66
bind:
7-
$processLogDir: '%process_logs_dir%'
8-
$indexLogs: '%clever_age_process_ui.index_logs.enabled%'
7+
$processConfigurationsManager: '@cleverage_ui_process.manager.process_configuration'
8+
$localeSwitcher: '@translation.locale_switcher'
9+
$request: '@request_stack'
10+
$messageBus: '@messenger.default_bus'
11+
$uploadDirectory: '%upload_directory%'
12+
$context: '@EasyCorp\Bundle\EasyAdminBundle\Factory\AdminContextFactory'
13+
$logDirectory: '%kernel.logs_dir%'
914
tags:
1015
- { name: 'controller.service_arguments' }

‎config/services/event_subscriber.yaml

+3-15
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@ services:
55
tags:
66
- { name: 'kernel.event_subscriber' }
77
arguments:
8-
- '@doctrine.orm.entity_manager'
9-
- '@cleverage_ui_process.repository.process'
10-
- '@cleverage_ui_process.monolog_handler.process_log'
11-
- '@messenger.default_bus'
12-
- '@cleverage_ui_process.manager.configuration'
13-
- '%process_logs_dir%'
14-
- '%clever_age_process_ui.index_logs.enabled%'
15-
16-
cleverage_ui_process.event_subscriber.crud.process:
17-
class: CleverAge\ProcessUiBundle\EventSubscriber\Crud\ProcessCrudListener
18-
public: false
19-
tags:
20-
- { name: 'kernel.event_subscriber' }
21-
arguments:
22-
- '@cleverage_ui_process.repository.process'
8+
- '@cleverage_ui_process.monolog_handler.process'
9+
- '@cleverage_ui_process.monolog_handler.doctrine_process'
10+
- '@cleverage_ui_process.manager.process_execution'

‎config/services/http_value_resolver.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
services:
2+
cleverage_ui_process.http_value_resolver.http_process_execute:
3+
class: CleverAge\ProcessUiBundle\Http\ValueResolver\HttpProcessExecuteValueResolver
4+
public: false
5+
arguments:
6+
- '%upload_directory%'
7+
8+
cleverage_ui_process.http_value_resolver.process_configuration:
9+
class: CleverAge\ProcessUiBundle\Http\ValueResolver\ProcessConfigurationValueResolver
10+
public: false
11+
arguments:
12+
- '@cleverage_process.registry.process_configuration'

‎config/services/manager.yaml

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
services:
2-
cleverage_ui_process.manager.configuration:
3-
class: CleverAge\ProcessUiBundle\Manager\ProcessUiConfigurationManager
2+
cleverage_ui_process.manager.process_execution:
3+
class: CleverAge\ProcessUiBundle\Manager\ProcessExecutionManager
44
public: false
55
arguments:
6-
- '@cleverage_process.registry.process_configuration'
6+
- '@cleverage_ui_process.repository.process_execution'
77

8-
CleverAge\ProcessUiBundle\Manager\ProcessUiConfigurationManager:
9-
alias: 'cleverage_ui_process.manager.configuration'
8+
cleverage_ui_process.manager.process_configuration:
9+
class: CleverAge\ProcessUiBundle\Manager\ProcessConfigurationsManager
10+
public: false
11+
arguments:
12+
- '@cleverage_process.registry.process_configuration'

‎config/services/message.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
services:
2-
cleverage_ui_process.message.log_indexer_handler:
3-
class: CleverAge\ProcessUiBundle\Message\LogIndexerHandler
2+
cleverage_ui_process.message.cron_process_message_handler:
3+
class: CleverAge\ProcessUiBundle\Message\CronProcessMessageHandler
44
public: false
55
arguments:
6-
- '@doctrine'
6+
- '@messenger.default_bus'
77

8-
cleverage_ui_process.message.process_run_handler:
9-
class: CleverAge\ProcessUiBundle\Message\ProcessRunHandler
8+
cleverage_ui_process.message.process_execute_handler:
9+
class: CleverAge\ProcessUiBundle\Message\ProcessExecuteHandler
1010
public: false
1111
arguments:
12-
- '@cleverage_process.command.execute_process'
12+
- '@cleverage_process.manager.process'
13+
- '@cleverage_ui_process.monolog_handler.process'
1314

‎config/services/monolog_handler.yaml

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
services:
2-
cleverage_ui_process.monolog_handler.process_log:
3-
class: CleverAge\ProcessUiBundle\Monolog\Handler\ProcessLogHandler
2+
cleverage_ui_process.monolog_handler.doctrine_process:
3+
class: CleverAge\ProcessUiBundle\Monolog\Handler\DoctrineProcessHandler
4+
public: false
5+
calls:
6+
- [ setEntityManager, [ '@doctrine.orm.entity_manager' ] ]
7+
- [ setProcessExecutionManager, [ '@cleverage_ui_process.manager.process_execution' ] ]
8+
9+
cleverage_ui_process.monolog_handler.process:
10+
class: CleverAge\ProcessUiBundle\Monolog\Handler\ProcessHandler
411
public: false
512
arguments:
6-
- '%process_logs_dir%'
13+
- '%kernel.logs_dir%'
14+
- '@cleverage_ui_process.manager.process_execution'
715

‎config/services/parameters.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
parameters:
2-
process_logs_dir: '%kernel.logs_dir%/process'
2+
upload_directory: '%kernel.project_dir%/var/storage/uploads'

‎config/services/repository.yaml

+2-10
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,8 @@ services:
55
arguments:
66
- '@doctrine.orm.entity_manager'
77

8-
cleverage_ui_process.repository.process:
9-
class: CleverAge\ProcessUiBundle\Repository\ProcessRepository
10-
public: false
11-
arguments:
12-
- '@doctrine.orm.entity_manager'
13-
- '@cleverage_ui_process.manager.configuration'
14-
- '@cleverage_process.registry.process_configuration'
15-
16-
cleverage_ui_process.repository.user:
17-
class: CleverAge\ProcessUiBundle\Repository\UserRepository
8+
cleverage_ui_process.repository.process_schedule:
9+
class: CleverAge\ProcessUiBundle\Repository\ProcessScheduleRepository
1810
public: false
1911
arguments:
2012
- '@doctrine.orm.entity_manager'

‎config/services/scheduler.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
services:
2+
cleverage_ui_process.scheduler.cron:
3+
class: CleverAge\ProcessUiBundle\Scheduler\CronScheduler
4+
public: false
5+
arguments:
6+
- '@cleverage_ui_process.repository.process_schedule'
7+
- '@validator'
8+
- '@logger'

‎config/services/security.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
2-
cleverage_ui_process.security.login_form_auth_authenticator:
3-
class: CleverAge\ProcessUiBundle\Security\LoginFormAuthAuthenticator
2+
cleverage_ui_process.security.http_process_execution_authenticator:
3+
class: CleverAge\ProcessUiBundle\Security\HttpProcessExecutionAuthenticator
44
public: false
55
arguments:
6-
- '@router'
6+
- '@doctrine.orm.entity_manager'
77

‎config/services/twig.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
services:
2+
cleverage_ui_process.twig.log_level_extension:
3+
class: CleverAge\ProcessUiBundle\Twig\Extension\LogLevelExtension
4+
public: false
5+
tags:
6+
- { name: 'twig.extension' }
7+
8+
cleverage_ui_process.twig.md5_extension:
9+
class: CleverAge\ProcessUiBundle\Twig\Extension\MD5Extension
10+
public: false
11+
tags:
12+
- { name: 'twig.extension' }
13+
14+
cleverage_ui_process.twig.process_execution_extension:
15+
class: CleverAge\ProcessUiBundle\Twig\Extension\ProcessExecutionExtension
16+
public: false
17+
tags:
18+
- { name: 'twig.extension' }
19+
20+
cleverage_ui_process.twig.process_execution_extension_runtime:
21+
class: CleverAge\ProcessUiBundle\Twig\Runtime\ProcessExecutionExtensionRuntime
22+
public: false
23+
arguments:
24+
- '@cleverage_ui_process.repository.process_execution'
25+
- '@cleverage_ui_process.manager.process_configuration'

‎config/services/validator.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
services:
2+
cleverage_ui_process.validator.cron_expression_validator:
3+
class: CleverAge\ProcessUiBundle\Validator\CronExpressionValidator
4+
public: false
5+
tags:
6+
- { name: 'validator.constraint_validator' }
7+
8+
cleverage_ui_process.validator.every_expression_validator:
9+
class: CleverAge\ProcessUiBundle\Validator\EveryExpressionValidator
10+
public: false
11+
tags:
12+
- { name: 'validator.constraint_validator' }
13+
14+
cleverage_ui_process.validator.is_valid_process_code:
15+
class: CleverAge\ProcessUiBundle\Validator\IsValidProcessCodeValidator
16+
public: false
17+
tags:
18+
- { name: 'validator.constraint_validator' }
19+
arguments:
20+
- '@cleverage_process.registry.process_configuration'
21+

0 commit comments

Comments
 (0)