Skip to content

Commit 5bc453b

Browse files
authored
N°8755 - Remove unused Symfony features for iTop 3.3
1 parent 5dd450e commit 5bc453b

File tree

73 files changed

+65
-2780
lines changed

Some content is hidden

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

73 files changed

+65
-2780
lines changed

app.php

Lines changed: 0 additions & 29 deletions
This file was deleted.

composer.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,13 @@
2929
"symfony/http-foundation": "~6.4.0",
3030
"symfony/http-kernel": "~6.4.0",
3131
"symfony/mailer": "^6.4",
32-
"symfony/runtime": "~6.4.0",
3332
"symfony/security-csrf": "^6.4",
3433
"symfony/twig-bundle": "~6.4.0",
35-
"symfony/var-dumper": "~6.4.0",
3634
"symfony/yaml": "~6.4.0",
3735
"tecnickcom/tcpdf": "^6.6.0",
3836
"thenetworg/oauth2-azure": "^2.0"
3937
},
4038
"require-dev": {
41-
"symfony/debug-bundle": "~6.4.0",
4239
"symfony/stopwatch": "~6.4.0",
4340
"symfony/web-profiler-bundle": "~6.4.0"
4441
},
@@ -65,10 +62,7 @@
6562
},
6663
"sort-packages": true,
6764
"classmap-authoritative": true,
68-
"platform-check": true,
69-
"allow-plugins": {
70-
"symfony/runtime": true
71-
}
65+
"platform-check": true
7266
},
7367
"autoload": {
7468
"classmap": [
@@ -96,7 +90,7 @@
9690
"extra": {
9791
"symfony": {
9892
"allow-contrib": false,
99-
"require": "3.4.*"
93+
"require": "6.4.*"
10094
},
10195
"runtime": {
10296
"dotenv_path": "resources/symfony/.env"

composer.lock

Lines changed: 7 additions & 164 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/config.class.inc.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1797,14 +1797,6 @@ class Config
17971797
'source_of_value' => '',
17981798
'show_in_conf_sample' => false,
17991799
],
1800-
'application.secret' => [
1801-
'type' => 'string',
1802-
'description' => 'Application secret, uses this value for encrypting the cookies used in the remember me functionality and for creating signed URIs when using ESI (Edge Side Includes).',
1803-
'default' => '',
1804-
'value' => '',
1805-
'source_of_value' => '',
1806-
'show_in_conf_sample' => false,
1807-
],
18081800
'http.request.user_agent' => [
18091801
'type' => 'string',
18101802
'description' => 'HTTP request user agent, use this to set a custom agent on external requests.',
@@ -2198,7 +2190,6 @@ protected function Load($sConfigFile)
21982190
$this->m_sEncryptionLibrary = isset($MySettings['encryption_library']) ? trim($MySettings['encryption_library']) : $this->m_sEncryptionLibrary;
21992191
$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : array();
22002192
$this->m_iPasswordHashAlgo = isset($MySettings['password_hash_algo']) ? $MySettings['password_hash_algo'] : $this->m_iPasswordHashAlgo;
2201-
$this->m_sAppSecret = isset($MySettings['application.secret']) ? trim($MySettings['application.secret']) : $this->m_sAppSecret;
22022193
}
22032194

22042195
protected function Verify()
@@ -2522,7 +2513,6 @@ public function ToArray()
25222513
$aSettings['encryption_library'] = $this->m_sEncryptionLibrary;
25232514
$aSettings['csv_import_charsets'] = $this->m_aCharsets;
25242515
$aSettings['password_hash_algo'] = $this->m_iPasswordHashAlgo;
2525-
$aSettings['application.secret'] = $this->m_sAppSecret;
25262516

25272517
foreach ($this->m_aModuleSettings as $sModule => $aProperties)
25282518
{
@@ -2636,7 +2626,6 @@ public function WriteToFile($sFileName = '')
26362626
'encryption_library' => $this->m_sEncryptionLibrary,
26372627
'csv_import_charsets' => $this->m_aCharsets,
26382628
'password_hash_algo' => $this->m_iPasswordHashAlgo,
2639-
'application.secret' => $this->m_sAppSecret,
26402629
);
26412630
foreach ($aOtherValues as $sKey => $value)
26422631
{

datamodels/2.x/itop-portal-base/portal/config/bridge.php

Lines changed: 0 additions & 10 deletions
This file was deleted.

datamodels/2.x/itop-portal-base/portal/config/packages/framework.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
framework:
2-
#secret: (part of iTop general configuration, will be set dynamically via bridge.php)
2+
secret: '%env(APP_SECRET)%'
33
#default_locale: en
44
#csrf_protection: true
55
#http_method_override: true

datamodels/2.x/itop-portal-base/portal/src/Kernel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ protected function configureContainer(ContainerConfigurator $container)
8383
$confDir = '../config';
8484

8585
$container->import(new FileResource($this->getProjectDir().'/config/bundles.php'));
86-
$container->import($confDir.'/bridge.php');
8786
$container->parameters()->set('container.dumper.inline_class_loader', true);
8887

8988
$container->import($confDir.'/{packages}/*'.self::CONFIG_EXTS);

lib/autoload_runtime.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

lib/bin/var-dump-server.bat

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@ECHO OFF
2+
setlocal DISABLEDELAYEDEXPANSION
3+
SET BIN_TARGET=%~dp0/var-dump-server
4+
SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
5+
php "%BIN_TARGET%" %*

0 commit comments

Comments
 (0)