Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions app.php

This file was deleted.

10 changes: 2 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,13 @@
"symfony/http-foundation": "~6.4.0",
"symfony/http-kernel": "~6.4.0",
"symfony/mailer": "^6.4",
"symfony/runtime": "~6.4.0",
"symfony/security-csrf": "^6.4",
"symfony/twig-bundle": "~6.4.0",
"symfony/var-dumper": "~6.4.0",
"symfony/yaml": "~6.4.0",
"tecnickcom/tcpdf": "^6.6.0",
"thenetworg/oauth2-azure": "^2.0"
},
"require-dev": {
"symfony/debug-bundle": "~6.4.0",
"symfony/stopwatch": "~6.4.0",
"symfony/web-profiler-bundle": "~6.4.0"
},
Expand All @@ -65,10 +62,7 @@
},
"sort-packages": true,
"classmap-authoritative": true,
"platform-check": true,
"allow-plugins": {
"symfony/runtime": true
}
"platform-check": true
},
"autoload": {
"classmap": [
Expand Down Expand Up @@ -96,7 +90,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "3.4.*"
"require": "6.4.*"
},
"runtime": {
"dotenv_path": "resources/symfony/.env"
Expand Down
171 changes: 7 additions & 164 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions core/config.class.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -1797,14 +1797,6 @@ class Config
'source_of_value' => '',
'show_in_conf_sample' => false,
],
'application.secret' => [
'type' => 'string',
'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).',
'default' => '',
'value' => '',
'source_of_value' => '',
'show_in_conf_sample' => false,
],
'http.request.user_agent' => [
'type' => 'string',
'description' => 'HTTP request user agent, use this to set a custom agent on external requests.',
Expand Down Expand Up @@ -2198,7 +2190,6 @@ protected function Load($sConfigFile)
$this->m_sEncryptionLibrary = isset($MySettings['encryption_library']) ? trim($MySettings['encryption_library']) : $this->m_sEncryptionLibrary;
$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : array();
$this->m_iPasswordHashAlgo = isset($MySettings['password_hash_algo']) ? $MySettings['password_hash_algo'] : $this->m_iPasswordHashAlgo;
$this->m_sAppSecret = isset($MySettings['application.secret']) ? trim($MySettings['application.secret']) : $this->m_sAppSecret;
}

protected function Verify()
Expand Down Expand Up @@ -2522,7 +2513,6 @@ public function ToArray()
$aSettings['encryption_library'] = $this->m_sEncryptionLibrary;
$aSettings['csv_import_charsets'] = $this->m_aCharsets;
$aSettings['password_hash_algo'] = $this->m_iPasswordHashAlgo;
$aSettings['application.secret'] = $this->m_sAppSecret;

foreach ($this->m_aModuleSettings as $sModule => $aProperties)
{
Expand Down Expand Up @@ -2636,7 +2626,6 @@ public function WriteToFile($sFileName = '')
'encryption_library' => $this->m_sEncryptionLibrary,
'csv_import_charsets' => $this->m_aCharsets,
'password_hash_algo' => $this->m_iPasswordHashAlgo,
'application.secret' => $this->m_sAppSecret,
);
foreach ($aOtherValues as $sKey => $value)
{
Expand Down
10 changes: 0 additions & 10 deletions datamodels/2.x/itop-portal-base/portal/config/bridge.php

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
framework:
#secret: (part of iTop general configuration, will be set dynamically via bridge.php)
secret: '%env(APP_SECRET)%'
#default_locale: en
#csrf_protection: true
#http_method_override: true
Expand Down
1 change: 0 additions & 1 deletion datamodels/2.x/itop-portal-base/portal/src/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ protected function configureContainer(ContainerConfigurator $container)
$confDir = '../config';

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

$container->import($confDir.'/{packages}/*'.self::CONFIG_EXTS);
Expand Down
31 changes: 0 additions & 31 deletions lib/autoload_runtime.php

This file was deleted.

5 changes: 5 additions & 0 deletions lib/bin/var-dump-server.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@ECHO OFF
setlocal DISABLEDELAYEDEXPANSION
SET BIN_TARGET=%~dp0/var-dump-server
SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
php "%BIN_TARGET%" %*
Loading