From 5bc453bca65a8f37d83df7ba51e33e90f65046b0 Mon Sep 17 00:00:00 2001 From: Benjamin Dalsass <95754414+bdalsass@users.noreply.github.com> Date: Mon, 13 Oct 2025 08:24:20 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B08755=20-=20Remove=20unused=20Symfony=20f?= =?UTF-8?q?eatures=20for=20iTop=203.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.php | 29 --- composer.json | 10 +- composer.lock | 171 +------------ core/config.class.inc.php | 11 - .../itop-portal-base/portal/config/bridge.php | 10 - .../portal/config/packages/framework.yaml | 2 +- .../itop-portal-base/portal/src/Kernel.php | 1 - lib/autoload_runtime.php | 31 --- lib/bin/var-dump-server.bat | 5 + lib/composer/autoload_classmap.php | 36 +-- lib/composer/autoload_files.php | 2 +- lib/composer/autoload_psr4.php | 3 - lib/composer/autoload_static.php | 53 +--- lib/composer/installed.json | 178 +------------ lib/composer/installed.php | 28 +-- lib/symfony/debug-bundle/CHANGELOG.md | 8 - .../Command/ServerDumpPlaceholderCommand.php | 54 ---- lib/symfony/debug-bundle/DebugBundle.php | 72 ------ .../Compiler/DumpDataCollectorPass.php | 45 ---- .../DependencyInjection/Configuration.php | 60 ----- .../DependencyInjection/DebugExtension.php | 102 -------- lib/symfony/debug-bundle/LICENSE | 19 -- lib/symfony/debug-bundle/README.md | 13 - .../Resources/config/schema/debug-1.0.xsd | 15 -- .../Resources/config/services.php | 140 ----------- .../Resources/views/Profiler/dump.html.twig | 83 ------- .../Resources/views/Profiler/icon.svg | 9 - lib/symfony/debug-bundle/composer.json | 41 --- lib/symfony/runtime/CHANGELOG.md | 19 -- lib/symfony/runtime/GenericRuntime.php | 223 ----------------- .../runtime/Internal/BasicErrorHandler.php | 53 ---- .../runtime/Internal/ComposerPlugin.php | 119 --------- .../Internal/Console/ApplicationRuntime.php | 21 -- .../Console/Command/CommandRuntime.php | 21 -- .../Console/Input/InputInterfaceRuntime.php | 21 -- .../Console/Output/OutputInterfaceRuntime.php | 21 -- .../HttpFoundation/RequestRuntime.php | 21 -- .../HttpFoundation/ResponseRuntime.php | 21 -- .../HttpKernel/HttpKernelInterfaceRuntime.php | 21 -- .../runtime/Internal/MissingDotenv.php | 19 -- .../runtime/Internal/SymfonyErrorHandler.php | 54 ---- .../Internal/autoload_runtime.template | 28 --- lib/symfony/runtime/LICENSE | 19 -- lib/symfony/runtime/README.md | 13 - .../runtime/Resolver/ClosureResolver.php | 31 --- .../runtime/Resolver/DebugClosureResolver.php | 36 --- lib/symfony/runtime/ResolverInterface.php | 23 -- lib/symfony/runtime/Runner/ClosureRunner.php | 44 ---- .../Symfony/ConsoleApplicationRunner.php | 51 ---- .../Runner/Symfony/HttpKernelRunner.php | 58 ----- .../runtime/Runner/Symfony/ResponseRunner.php | 33 --- lib/symfony/runtime/RunnerInterface.php | 20 -- lib/symfony/runtime/RuntimeInterface.php | 34 --- lib/symfony/runtime/SymfonyRuntime.php | 234 ------------------ lib/symfony/runtime/composer.json | 45 ---- lib/symfony/var-dumper/Cloner/Data.php | 2 +- .../var-dumper/Cloner/Internal/NoDefault.php | 25 -- lib/symfony/var-dumper/Cloner/Stub.php | 41 +-- resources/symfony/.env | 20 -- resources/symfony/config/bundles.php | 8 - resources/symfony/config/packages/cache.yaml | 19 -- resources/symfony/config/packages/debug.yaml | 5 - .../symfony/config/packages/framework.yaml | 25 -- .../packages/itop_configuration_bridge.php | 32 --- .../symfony/config/packages/routing.yaml | 12 - resources/symfony/config/packages/twig.yaml | 6 - .../symfony/config/packages/web_profiler.yaml | 17 -- resources/symfony/config/preload.php | 9 - resources/symfony/config/routes.yaml | 5 - .../symfony/config/routes/framework.yaml | 4 - .../symfony/config/routes/web_profiler.yaml | 8 - resources/symfony/config/services.yaml | 22 -- sources/Kernel.php | 51 ---- 73 files changed, 65 insertions(+), 2780 deletions(-) delete mode 100644 app.php delete mode 100644 datamodels/2.x/itop-portal-base/portal/config/bridge.php delete mode 100644 lib/autoload_runtime.php create mode 100755 lib/bin/var-dump-server.bat delete mode 100644 lib/symfony/debug-bundle/CHANGELOG.md delete mode 100644 lib/symfony/debug-bundle/Command/ServerDumpPlaceholderCommand.php delete mode 100644 lib/symfony/debug-bundle/DebugBundle.php delete mode 100644 lib/symfony/debug-bundle/DependencyInjection/Compiler/DumpDataCollectorPass.php delete mode 100644 lib/symfony/debug-bundle/DependencyInjection/Configuration.php delete mode 100644 lib/symfony/debug-bundle/DependencyInjection/DebugExtension.php delete mode 100644 lib/symfony/debug-bundle/LICENSE delete mode 100644 lib/symfony/debug-bundle/README.md delete mode 100644 lib/symfony/debug-bundle/Resources/config/schema/debug-1.0.xsd delete mode 100644 lib/symfony/debug-bundle/Resources/config/services.php delete mode 100644 lib/symfony/debug-bundle/Resources/views/Profiler/dump.html.twig delete mode 100644 lib/symfony/debug-bundle/Resources/views/Profiler/icon.svg delete mode 100644 lib/symfony/debug-bundle/composer.json delete mode 100644 lib/symfony/runtime/CHANGELOG.md delete mode 100644 lib/symfony/runtime/GenericRuntime.php delete mode 100644 lib/symfony/runtime/Internal/BasicErrorHandler.php delete mode 100644 lib/symfony/runtime/Internal/ComposerPlugin.php delete mode 100644 lib/symfony/runtime/Internal/Console/ApplicationRuntime.php delete mode 100644 lib/symfony/runtime/Internal/Console/Command/CommandRuntime.php delete mode 100644 lib/symfony/runtime/Internal/Console/Input/InputInterfaceRuntime.php delete mode 100644 lib/symfony/runtime/Internal/Console/Output/OutputInterfaceRuntime.php delete mode 100644 lib/symfony/runtime/Internal/HttpFoundation/RequestRuntime.php delete mode 100644 lib/symfony/runtime/Internal/HttpFoundation/ResponseRuntime.php delete mode 100644 lib/symfony/runtime/Internal/HttpKernel/HttpKernelInterfaceRuntime.php delete mode 100644 lib/symfony/runtime/Internal/MissingDotenv.php delete mode 100644 lib/symfony/runtime/Internal/SymfonyErrorHandler.php delete mode 100644 lib/symfony/runtime/Internal/autoload_runtime.template delete mode 100644 lib/symfony/runtime/LICENSE delete mode 100644 lib/symfony/runtime/README.md delete mode 100644 lib/symfony/runtime/Resolver/ClosureResolver.php delete mode 100644 lib/symfony/runtime/Resolver/DebugClosureResolver.php delete mode 100644 lib/symfony/runtime/ResolverInterface.php delete mode 100644 lib/symfony/runtime/Runner/ClosureRunner.php delete mode 100644 lib/symfony/runtime/Runner/Symfony/ConsoleApplicationRunner.php delete mode 100644 lib/symfony/runtime/Runner/Symfony/HttpKernelRunner.php delete mode 100644 lib/symfony/runtime/Runner/Symfony/ResponseRunner.php delete mode 100644 lib/symfony/runtime/RunnerInterface.php delete mode 100644 lib/symfony/runtime/RuntimeInterface.php delete mode 100644 lib/symfony/runtime/SymfonyRuntime.php delete mode 100644 lib/symfony/runtime/composer.json delete mode 100644 lib/symfony/var-dumper/Cloner/Internal/NoDefault.php delete mode 100644 resources/symfony/.env delete mode 100644 resources/symfony/config/bundles.php delete mode 100644 resources/symfony/config/packages/cache.yaml delete mode 100644 resources/symfony/config/packages/debug.yaml delete mode 100644 resources/symfony/config/packages/framework.yaml delete mode 100644 resources/symfony/config/packages/itop_configuration_bridge.php delete mode 100644 resources/symfony/config/packages/routing.yaml delete mode 100644 resources/symfony/config/packages/twig.yaml delete mode 100644 resources/symfony/config/packages/web_profiler.yaml delete mode 100644 resources/symfony/config/preload.php delete mode 100644 resources/symfony/config/routes.yaml delete mode 100644 resources/symfony/config/routes/framework.yaml delete mode 100644 resources/symfony/config/routes/web_profiler.yaml delete mode 100644 resources/symfony/config/services.yaml delete mode 100644 sources/Kernel.php diff --git a/app.php b/app.php deleted file mode 100644 index ab1bc8ef0..000000000 --- a/app.php +++ /dev/null @@ -1,29 +0,0 @@ -=8.1" - }, - "conflict": { - "symfony/dotenv": "<5.4" - }, - "require-dev": { - "composer/composer": "^1.0.2|^2.0", - "symfony/console": "^5.4.9|^6.0.9|^7.0", - "symfony/dotenv": "^5.4|^6.0|^7.0", - "symfony/http-foundation": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0" - }, - "type": "composer-plugin", - "extra": { - "class": "Symfony\\Component\\Runtime\\Internal\\ComposerPlugin" - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Runtime\\": "", - "Symfony\\Runtime\\Symfony\\Component\\": "Internal/" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Enables decoupling PHP applications from global state", - "homepage": "https://symfony.com", - "keywords": [ - "runtime" - ], - "support": { - "source": "https://github.com/symfony/runtime/tree/v6.4.24" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://github.com/nicolas-grekas", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2025-07-10T08:14:14+00:00" - }, { "name": "symfony/security-core", "version": "v6.4.26", @@ -5068,16 +4985,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.4.25", + "version": "v6.4.26", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c" + "reference": "cfae1497a2f1eaad78dbc0590311c599c7178d4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6cd92486e9fc32506370822c57bc02353a5a92c", - "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cfae1497a2f1eaad78dbc0590311c599c7178d4a", + "reference": "cfae1497a2f1eaad78dbc0590311c599c7178d4a", "shasum": "" }, "require": { @@ -5132,7 +5049,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.25" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.26" }, "funding": [ { @@ -5152,7 +5069,7 @@ "type": "tidelift" } ], - "time": "2025-08-13T09:41:44+00:00" + "time": "2025-09-25T15:37:27+00:00" }, { "name": "symfony/var-exporter", @@ -5523,80 +5440,6 @@ } ], "packages-dev": [ - { - "name": "symfony/debug-bundle", - "version": "v6.4.13", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug-bundle.git", - "reference": "7bcfaff39e094cc09455201916d016d9b2ae08ff" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/7bcfaff39e094cc09455201916d016d9b2ae08ff", - "reference": "7bcfaff39e094cc09455201916d016d9b2ae08ff", - "shasum": "" - }, - "require": { - "ext-xml": "*", - "php": ">=8.1", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0", - "symfony/twig-bridge": "^5.4|^6.0|^7.0", - "symfony/var-dumper": "^5.4|^6.0|^7.0" - }, - "conflict": { - "symfony/config": "<5.4", - "symfony/dependency-injection": "<5.4" - }, - "require-dev": { - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/web-profiler-bundle": "^5.4|^6.0|^7.0" - }, - "type": "symfony-bundle", - "autoload": { - "psr-4": { - "Symfony\\Bundle\\DebugBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/debug-bundle/tree/v6.4.13" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-09-25T14:18:03+00:00" - }, { "name": "symfony/stopwatch", "version": "v6.4.24", diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 85a39b587..68e4d2d6f 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -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.', @@ -2198,7 +2190,6 @@ class Config $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() @@ -2522,7 +2513,6 @@ class Config $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) { @@ -2636,7 +2626,6 @@ class Config '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) { diff --git a/datamodels/2.x/itop-portal-base/portal/config/bridge.php b/datamodels/2.x/itop-portal-base/portal/config/bridge.php deleted file mode 100644 index 5c10a65e5..000000000 --- a/datamodels/2.x/itop-portal-base/portal/config/bridge.php +++ /dev/null @@ -1,10 +0,0 @@ -parameters()->set('kernel.secret', MetaModel::GetConfig()->Get('application.secret')); - -}; \ No newline at end of file diff --git a/datamodels/2.x/itop-portal-base/portal/config/packages/framework.yaml b/datamodels/2.x/itop-portal-base/portal/config/packages/framework.yaml index 8740e4e8b..b5707a878 100644 --- a/datamodels/2.x/itop-portal-base/portal/config/packages/framework.yaml +++ b/datamodels/2.x/itop-portal-base/portal/config/packages/framework.yaml @@ -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 diff --git a/datamodels/2.x/itop-portal-base/portal/src/Kernel.php b/datamodels/2.x/itop-portal-base/portal/src/Kernel.php index d4f6b6502..89259afdd 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Kernel.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Kernel.php @@ -83,7 +83,6 @@ class Kernel extends BaseKernel $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); diff --git a/lib/autoload_runtime.php b/lib/autoload_runtime.php deleted file mode 100644 index 6b5344587..000000000 --- a/lib/autoload_runtime.php +++ /dev/null @@ -1,31 +0,0 @@ - 'resources/symfony/.env', - 'project_dir' => dirname(__DIR__, 1), -]); - -[$app, $args] = $runtime - ->getResolver($app) - ->resolve(); - -$app = $app(...$args); - -exit( - $runtime - ->getRunner($app) - ->run() -); diff --git a/lib/bin/var-dump-server.bat b/lib/bin/var-dump-server.bat new file mode 100755 index 000000000..94333da54 --- /dev/null +++ b/lib/bin/var-dump-server.bat @@ -0,0 +1,5 @@ +@ECHO OFF +setlocal DISABLEDELAYEDEXPANSION +SET BIN_TARGET=%~dp0/var-dump-server +SET COMPOSER_RUNTIME_BIN_DIR=%~dp0 +php "%BIN_TARGET%" %* diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 76dffb3c0..397941d3c 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -472,7 +472,6 @@ return array( 'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => $baseDir . '/sources/Form/Validator/NotEmptyExtKeyValidator.php', 'Combodo\\iTop\\Form\\Validator\\SelectObjectValidator' => $baseDir . '/sources/Form/Validator/SelectObjectValidator.php', 'Combodo\\iTop\\Forms\\Twig\\Extension\\FormCompatibilityExtension' => $baseDir . '/sources/Forms/Twig/Extension/FormCompatibilityExtension.php', - 'Combodo\\iTop\\Kernel' => $baseDir . '/sources/Kernel.php', 'Combodo\\iTop\\PhpParser\\Evaluation\\PhpExpressionEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php', 'Combodo\\iTop\\Renderer\\BlockRenderer' => $baseDir . '/sources/Renderer/BlockRenderer.php', 'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => $baseDir . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php', @@ -1487,11 +1486,6 @@ return array( 'Symfony\\Bridge\\Twig\\TokenParser\\TransTokenParser' => $vendorDir . '/symfony/twig-bridge/TokenParser/TransTokenParser.php', 'Symfony\\Bridge\\Twig\\Translation\\TwigExtractor' => $vendorDir . '/symfony/twig-bridge/Translation/TwigExtractor.php', 'Symfony\\Bridge\\Twig\\UndefinedCallableHandler' => $vendorDir . '/symfony/twig-bridge/UndefinedCallableHandler.php', - 'Symfony\\Bundle\\DebugBundle\\Command\\ServerDumpPlaceholderCommand' => $vendorDir . '/symfony/debug-bundle/Command/ServerDumpPlaceholderCommand.php', - 'Symfony\\Bundle\\DebugBundle\\DebugBundle' => $vendorDir . '/symfony/debug-bundle/DebugBundle.php', - 'Symfony\\Bundle\\DebugBundle\\DependencyInjection\\Compiler\\DumpDataCollectorPass' => $vendorDir . '/symfony/debug-bundle/DependencyInjection/Compiler/DumpDataCollectorPass.php', - 'Symfony\\Bundle\\DebugBundle\\DependencyInjection\\Configuration' => $vendorDir . '/symfony/debug-bundle/DependencyInjection/Configuration.php', - 'Symfony\\Bundle\\DebugBundle\\DependencyInjection\\DebugExtension' => $vendorDir . '/symfony/debug-bundle/DependencyInjection/DebugExtension.php', 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\AbstractPhpFileCacheWarmer' => $vendorDir . '/symfony/framework-bundle/CacheWarmer/AbstractPhpFileCacheWarmer.php', 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\AnnotationsCacheWarmer' => $vendorDir . '/symfony/framework-bundle/CacheWarmer/AnnotationsCacheWarmer.php', 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\CachePoolClearerCacheWarmer' => $vendorDir . '/symfony/framework-bundle/CacheWarmer/CachePoolClearerCacheWarmer.php', @@ -2418,6 +2412,13 @@ return array( 'Symfony\\Component\\Form\\SubmitButton' => $vendorDir . '/symfony/form/SubmitButton.php', 'Symfony\\Component\\Form\\SubmitButtonBuilder' => $vendorDir . '/symfony/form/SubmitButtonBuilder.php', 'Symfony\\Component\\Form\\SubmitButtonTypeInterface' => $vendorDir . '/symfony/form/SubmitButtonTypeInterface.php', + 'Symfony\\Component\\Form\\Test\\FormBuilderInterface' => $vendorDir . '/symfony/form/Test/FormBuilderInterface.php', + 'Symfony\\Component\\Form\\Test\\FormIntegrationTestCase' => $vendorDir . '/symfony/form/Test/FormIntegrationTestCase.php', + 'Symfony\\Component\\Form\\Test\\FormInterface' => $vendorDir . '/symfony/form/Test/FormInterface.php', + 'Symfony\\Component\\Form\\Test\\FormPerformanceTestCase' => $vendorDir . '/symfony/form/Test/FormPerformanceTestCase.php', + 'Symfony\\Component\\Form\\Test\\Traits\\RunTestTrait' => $vendorDir . '/symfony/form/Test/Traits/RunTestTrait.php', + 'Symfony\\Component\\Form\\Test\\Traits\\ValidatorExtensionTrait' => $vendorDir . '/symfony/form/Test/Traits/ValidatorExtensionTrait.php', + 'Symfony\\Component\\Form\\Test\\TypeTestCase' => $vendorDir . '/symfony/form/Test/TypeTestCase.php', 'Symfony\\Component\\Form\\Util\\FormUtil' => $vendorDir . '/symfony/form/Util/FormUtil.php', 'Symfony\\Component\\Form\\Util\\InheritDataAwareIterator' => $vendorDir . '/symfony/form/Util/InheritDataAwareIterator.php', 'Symfony\\Component\\Form\\Util\\OptionsResolverWrapper' => $vendorDir . '/symfony/form/Util/OptionsResolverWrapper.php', @@ -2951,21 +2952,6 @@ return array( 'Symfony\\Component\\Routing\\RouteCompilerInterface' => $vendorDir . '/symfony/routing/RouteCompilerInterface.php', 'Symfony\\Component\\Routing\\Router' => $vendorDir . '/symfony/routing/Router.php', 'Symfony\\Component\\Routing\\RouterInterface' => $vendorDir . '/symfony/routing/RouterInterface.php', - 'Symfony\\Component\\Runtime\\GenericRuntime' => $vendorDir . '/symfony/runtime/GenericRuntime.php', - 'Symfony\\Component\\Runtime\\Internal\\BasicErrorHandler' => $vendorDir . '/symfony/runtime/Internal/BasicErrorHandler.php', - 'Symfony\\Component\\Runtime\\Internal\\ComposerPlugin' => $vendorDir . '/symfony/runtime/Internal/ComposerPlugin.php', - 'Symfony\\Component\\Runtime\\Internal\\MissingDotenv' => $vendorDir . '/symfony/runtime/Internal/MissingDotenv.php', - 'Symfony\\Component\\Runtime\\Internal\\SymfonyErrorHandler' => $vendorDir . '/symfony/runtime/Internal/SymfonyErrorHandler.php', - 'Symfony\\Component\\Runtime\\ResolverInterface' => $vendorDir . '/symfony/runtime/ResolverInterface.php', - 'Symfony\\Component\\Runtime\\Resolver\\ClosureResolver' => $vendorDir . '/symfony/runtime/Resolver/ClosureResolver.php', - 'Symfony\\Component\\Runtime\\Resolver\\DebugClosureResolver' => $vendorDir . '/symfony/runtime/Resolver/DebugClosureResolver.php', - 'Symfony\\Component\\Runtime\\RunnerInterface' => $vendorDir . '/symfony/runtime/RunnerInterface.php', - 'Symfony\\Component\\Runtime\\Runner\\ClosureRunner' => $vendorDir . '/symfony/runtime/Runner/ClosureRunner.php', - 'Symfony\\Component\\Runtime\\Runner\\Symfony\\ConsoleApplicationRunner' => $vendorDir . '/symfony/runtime/Runner/Symfony/ConsoleApplicationRunner.php', - 'Symfony\\Component\\Runtime\\Runner\\Symfony\\HttpKernelRunner' => $vendorDir . '/symfony/runtime/Runner/Symfony/HttpKernelRunner.php', - 'Symfony\\Component\\Runtime\\Runner\\Symfony\\ResponseRunner' => $vendorDir . '/symfony/runtime/Runner/Symfony/ResponseRunner.php', - 'Symfony\\Component\\Runtime\\RuntimeInterface' => $vendorDir . '/symfony/runtime/RuntimeInterface.php', - 'Symfony\\Component\\Runtime\\SymfonyRuntime' => $vendorDir . '/symfony/runtime/SymfonyRuntime.php', 'Symfony\\Component\\Security\\Core\\AuthenticationEvents' => $vendorDir . '/symfony/security-core/AuthenticationEvents.php', 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationTrustResolver' => $vendorDir . '/symfony/security-core/Authentication/AuthenticationTrustResolver.php', 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationTrustResolverInterface' => $vendorDir . '/symfony/security-core/Authentication/AuthenticationTrustResolverInterface.php', @@ -3136,7 +3122,6 @@ return array( 'Symfony\\Component\\VarDumper\\Cloner\\Cursor' => $vendorDir . '/symfony/var-dumper/Cloner/Cursor.php', 'Symfony\\Component\\VarDumper\\Cloner\\Data' => $vendorDir . '/symfony/var-dumper/Cloner/Data.php', 'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => $vendorDir . '/symfony/var-dumper/Cloner/DumperInterface.php', - 'Symfony\\Component\\VarDumper\\Cloner\\Internal\\NoDefault' => $vendorDir . '/symfony/var-dumper/Cloner/Internal/NoDefault.php', 'Symfony\\Component\\VarDumper\\Cloner\\Stub' => $vendorDir . '/symfony/var-dumper/Cloner/Stub.php', 'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => $vendorDir . '/symfony/var-dumper/Cloner/VarCloner.php', 'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php', @@ -3247,13 +3232,6 @@ return array( 'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Normalizer.php', 'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php', 'Symfony\\Polyfill\\Php83\\Php83' => $vendorDir . '/symfony/polyfill-php83/Php83.php', - 'Symfony\\Runtime\\Symfony\\Component\\Console\\ApplicationRuntime' => $vendorDir . '/symfony/runtime/Internal/Console/ApplicationRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\Console\\Command\\CommandRuntime' => $vendorDir . '/symfony/runtime/Internal/Console/Command/CommandRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\Console\\Input\\InputInterfaceRuntime' => $vendorDir . '/symfony/runtime/Internal/Console/Input/InputInterfaceRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\Console\\Output\\OutputInterfaceRuntime' => $vendorDir . '/symfony/runtime/Internal/Console/Output/OutputInterfaceRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\HttpFoundation\\RequestRuntime' => $vendorDir . '/symfony/runtime/Internal/HttpFoundation/RequestRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\HttpFoundation\\ResponseRuntime' => $vendorDir . '/symfony/runtime/Internal/HttpFoundation/ResponseRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\HttpKernel\\HttpKernelInterfaceRuntime' => $vendorDir . '/symfony/runtime/Internal/HttpKernel/HttpKernelInterfaceRuntime.php', 'SynchroExceptionNotStarted' => $baseDir . '/application/exceptions/SynchroExceptionNotStarted.php', 'System' => $vendorDir . '/pear/pear-core-minimal/src/System.php', 'TCPDF' => $vendorDir . '/tecnickcom/tcpdf/tcpdf.php', diff --git a/lib/composer/autoload_files.php b/lib/composer/autoload_files.php index b0244afb9..26e7e2345 100644 --- a/lib/composer/autoload_files.php +++ b/lib/composer/autoload_files.php @@ -10,8 +10,8 @@ return array( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php', '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', '662a729f963d39afe703c9d9b7ab4a8c' => $vendorDir . '/symfony/polyfill-php83/bootstrap.php', - '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php', 'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php', + '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php', '89efb1254ef2d1c5d80096acd12c4098' => $vendorDir . '/twig/twig/src/Resources/core.php', 'ffecb95d45175fd40f75be8a23b34f90' => $vendorDir . '/twig/twig/src/Resources/debug.php', 'c7baa00073ee9c61edf148c51917cfb4' => $vendorDir . '/twig/twig/src/Resources/escaper.php', diff --git a/lib/composer/autoload_psr4.php b/lib/composer/autoload_psr4.php index f9549b07d..0334bd4ce 100644 --- a/lib/composer/autoload_psr4.php +++ b/lib/composer/autoload_psr4.php @@ -8,7 +8,6 @@ $baseDir = dirname($vendorDir); return array( 'Twig\\' => array($vendorDir . '/twig/twig/src'), 'TheNetworg\\OAuth2\\Client\\' => array($vendorDir . '/thenetworg/oauth2-azure/src'), - 'Symfony\\Runtime\\Symfony\\Component\\' => array($vendorDir . '/symfony/runtime/Internal'), 'Symfony\\Polyfill\\Php83\\' => array($vendorDir . '/symfony/polyfill-php83'), 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'), 'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'), @@ -27,7 +26,6 @@ return array( 'Symfony\\Component\\Stopwatch\\' => array($vendorDir . '/symfony/stopwatch'), 'Symfony\\Component\\Security\\Csrf\\' => array($vendorDir . '/symfony/security-csrf'), 'Symfony\\Component\\Security\\Core\\' => array($vendorDir . '/symfony/security-core'), - 'Symfony\\Component\\Runtime\\' => array($vendorDir . '/symfony/runtime'), 'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'), 'Symfony\\Component\\PropertyInfo\\' => array($vendorDir . '/symfony/property-info'), 'Symfony\\Component\\PropertyAccess\\' => array($vendorDir . '/symfony/property-access'), @@ -51,7 +49,6 @@ return array( 'Symfony\\Bundle\\WebProfilerBundle\\' => array($vendorDir . '/symfony/web-profiler-bundle'), 'Symfony\\Bundle\\TwigBundle\\' => array($vendorDir . '/symfony/twig-bundle'), 'Symfony\\Bundle\\FrameworkBundle\\' => array($vendorDir . '/symfony/framework-bundle'), - 'Symfony\\Bundle\\DebugBundle\\' => array($vendorDir . '/symfony/debug-bundle'), 'Symfony\\Bridge\\Twig\\' => array($vendorDir . '/symfony/twig-bridge'), 'Soundasleep\\' => array($vendorDir . '/soundasleep/html2text/src'), 'ScssPhp\\ScssPhp\\' => array($vendorDir . '/scssphp/scssphp/src'), diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 9477d8762..31cd57336 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -11,8 +11,8 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', '662a729f963d39afe703c9d9b7ab4a8c' => __DIR__ . '/..' . '/symfony/polyfill-php83/bootstrap.php', - '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php', 'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php', + '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php', '89efb1254ef2d1c5d80096acd12c4098' => __DIR__ . '/..' . '/twig/twig/src/Resources/core.php', 'ffecb95d45175fd40f75be8a23b34f90' => __DIR__ . '/..' . '/twig/twig/src/Resources/debug.php', 'c7baa00073ee9c61edf148c51917cfb4' => __DIR__ . '/..' . '/twig/twig/src/Resources/escaper.php', @@ -35,7 +35,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f ), 'S' => array ( - 'Symfony\\Runtime\\Symfony\\Component\\' => 34, 'Symfony\\Polyfill\\Php83\\' => 23, 'Symfony\\Polyfill\\Mbstring\\' => 26, 'Symfony\\Polyfill\\Intl\\Normalizer\\' => 33, @@ -54,7 +53,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Symfony\\Component\\Stopwatch\\' => 28, 'Symfony\\Component\\Security\\Csrf\\' => 32, 'Symfony\\Component\\Security\\Core\\' => 32, - 'Symfony\\Component\\Runtime\\' => 26, 'Symfony\\Component\\Routing\\' => 26, 'Symfony\\Component\\PropertyInfo\\' => 31, 'Symfony\\Component\\PropertyAccess\\' => 33, @@ -78,7 +76,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Symfony\\Bundle\\WebProfilerBundle\\' => 33, 'Symfony\\Bundle\\TwigBundle\\' => 26, 'Symfony\\Bundle\\FrameworkBundle\\' => 31, - 'Symfony\\Bundle\\DebugBundle\\' => 27, 'Symfony\\Bridge\\Twig\\' => 20, 'Soundasleep\\' => 12, 'ScssPhp\\ScssPhp\\' => 16, @@ -128,10 +125,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f array ( 0 => __DIR__ . '/..' . '/thenetworg/oauth2-azure/src', ), - 'Symfony\\Runtime\\Symfony\\Component\\' => - array ( - 0 => __DIR__ . '/..' . '/symfony/runtime/Internal', - ), 'Symfony\\Polyfill\\Php83\\' => array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-php83', @@ -204,10 +197,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f array ( 0 => __DIR__ . '/..' . '/symfony/security-core', ), - 'Symfony\\Component\\Runtime\\' => - array ( - 0 => __DIR__ . '/..' . '/symfony/runtime', - ), 'Symfony\\Component\\Routing\\' => array ( 0 => __DIR__ . '/..' . '/symfony/routing', @@ -300,10 +289,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f array ( 0 => __DIR__ . '/..' . '/symfony/framework-bundle', ), - 'Symfony\\Bundle\\DebugBundle\\' => - array ( - 0 => __DIR__ . '/..' . '/symfony/debug-bundle', - ), 'Symfony\\Bridge\\Twig\\' => array ( 0 => __DIR__ . '/..' . '/symfony/twig-bridge', @@ -868,7 +853,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/NotEmptyExtKeyValidator.php', 'Combodo\\iTop\\Form\\Validator\\SelectObjectValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/SelectObjectValidator.php', 'Combodo\\iTop\\Forms\\Twig\\Extension\\FormCompatibilityExtension' => __DIR__ . '/../..' . '/sources/Forms/Twig/Extension/FormCompatibilityExtension.php', - 'Combodo\\iTop\\Kernel' => __DIR__ . '/../..' . '/sources/Kernel.php', 'Combodo\\iTop\\PhpParser\\Evaluation\\PhpExpressionEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php', 'Combodo\\iTop\\Renderer\\BlockRenderer' => __DIR__ . '/../..' . '/sources/Renderer/BlockRenderer.php', 'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php', @@ -1883,11 +1867,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Symfony\\Bridge\\Twig\\TokenParser\\TransTokenParser' => __DIR__ . '/..' . '/symfony/twig-bridge/TokenParser/TransTokenParser.php', 'Symfony\\Bridge\\Twig\\Translation\\TwigExtractor' => __DIR__ . '/..' . '/symfony/twig-bridge/Translation/TwigExtractor.php', 'Symfony\\Bridge\\Twig\\UndefinedCallableHandler' => __DIR__ . '/..' . '/symfony/twig-bridge/UndefinedCallableHandler.php', - 'Symfony\\Bundle\\DebugBundle\\Command\\ServerDumpPlaceholderCommand' => __DIR__ . '/..' . '/symfony/debug-bundle/Command/ServerDumpPlaceholderCommand.php', - 'Symfony\\Bundle\\DebugBundle\\DebugBundle' => __DIR__ . '/..' . '/symfony/debug-bundle/DebugBundle.php', - 'Symfony\\Bundle\\DebugBundle\\DependencyInjection\\Compiler\\DumpDataCollectorPass' => __DIR__ . '/..' . '/symfony/debug-bundle/DependencyInjection/Compiler/DumpDataCollectorPass.php', - 'Symfony\\Bundle\\DebugBundle\\DependencyInjection\\Configuration' => __DIR__ . '/..' . '/symfony/debug-bundle/DependencyInjection/Configuration.php', - 'Symfony\\Bundle\\DebugBundle\\DependencyInjection\\DebugExtension' => __DIR__ . '/..' . '/symfony/debug-bundle/DependencyInjection/DebugExtension.php', 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\AbstractPhpFileCacheWarmer' => __DIR__ . '/..' . '/symfony/framework-bundle/CacheWarmer/AbstractPhpFileCacheWarmer.php', 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\AnnotationsCacheWarmer' => __DIR__ . '/..' . '/symfony/framework-bundle/CacheWarmer/AnnotationsCacheWarmer.php', 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\CachePoolClearerCacheWarmer' => __DIR__ . '/..' . '/symfony/framework-bundle/CacheWarmer/CachePoolClearerCacheWarmer.php', @@ -2814,6 +2793,13 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Symfony\\Component\\Form\\SubmitButton' => __DIR__ . '/..' . '/symfony/form/SubmitButton.php', 'Symfony\\Component\\Form\\SubmitButtonBuilder' => __DIR__ . '/..' . '/symfony/form/SubmitButtonBuilder.php', 'Symfony\\Component\\Form\\SubmitButtonTypeInterface' => __DIR__ . '/..' . '/symfony/form/SubmitButtonTypeInterface.php', + 'Symfony\\Component\\Form\\Test\\FormBuilderInterface' => __DIR__ . '/..' . '/symfony/form/Test/FormBuilderInterface.php', + 'Symfony\\Component\\Form\\Test\\FormIntegrationTestCase' => __DIR__ . '/..' . '/symfony/form/Test/FormIntegrationTestCase.php', + 'Symfony\\Component\\Form\\Test\\FormInterface' => __DIR__ . '/..' . '/symfony/form/Test/FormInterface.php', + 'Symfony\\Component\\Form\\Test\\FormPerformanceTestCase' => __DIR__ . '/..' . '/symfony/form/Test/FormPerformanceTestCase.php', + 'Symfony\\Component\\Form\\Test\\Traits\\RunTestTrait' => __DIR__ . '/..' . '/symfony/form/Test/Traits/RunTestTrait.php', + 'Symfony\\Component\\Form\\Test\\Traits\\ValidatorExtensionTrait' => __DIR__ . '/..' . '/symfony/form/Test/Traits/ValidatorExtensionTrait.php', + 'Symfony\\Component\\Form\\Test\\TypeTestCase' => __DIR__ . '/..' . '/symfony/form/Test/TypeTestCase.php', 'Symfony\\Component\\Form\\Util\\FormUtil' => __DIR__ . '/..' . '/symfony/form/Util/FormUtil.php', 'Symfony\\Component\\Form\\Util\\InheritDataAwareIterator' => __DIR__ . '/..' . '/symfony/form/Util/InheritDataAwareIterator.php', 'Symfony\\Component\\Form\\Util\\OptionsResolverWrapper' => __DIR__ . '/..' . '/symfony/form/Util/OptionsResolverWrapper.php', @@ -3347,21 +3333,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Symfony\\Component\\Routing\\RouteCompilerInterface' => __DIR__ . '/..' . '/symfony/routing/RouteCompilerInterface.php', 'Symfony\\Component\\Routing\\Router' => __DIR__ . '/..' . '/symfony/routing/Router.php', 'Symfony\\Component\\Routing\\RouterInterface' => __DIR__ . '/..' . '/symfony/routing/RouterInterface.php', - 'Symfony\\Component\\Runtime\\GenericRuntime' => __DIR__ . '/..' . '/symfony/runtime/GenericRuntime.php', - 'Symfony\\Component\\Runtime\\Internal\\BasicErrorHandler' => __DIR__ . '/..' . '/symfony/runtime/Internal/BasicErrorHandler.php', - 'Symfony\\Component\\Runtime\\Internal\\ComposerPlugin' => __DIR__ . '/..' . '/symfony/runtime/Internal/ComposerPlugin.php', - 'Symfony\\Component\\Runtime\\Internal\\MissingDotenv' => __DIR__ . '/..' . '/symfony/runtime/Internal/MissingDotenv.php', - 'Symfony\\Component\\Runtime\\Internal\\SymfonyErrorHandler' => __DIR__ . '/..' . '/symfony/runtime/Internal/SymfonyErrorHandler.php', - 'Symfony\\Component\\Runtime\\ResolverInterface' => __DIR__ . '/..' . '/symfony/runtime/ResolverInterface.php', - 'Symfony\\Component\\Runtime\\Resolver\\ClosureResolver' => __DIR__ . '/..' . '/symfony/runtime/Resolver/ClosureResolver.php', - 'Symfony\\Component\\Runtime\\Resolver\\DebugClosureResolver' => __DIR__ . '/..' . '/symfony/runtime/Resolver/DebugClosureResolver.php', - 'Symfony\\Component\\Runtime\\RunnerInterface' => __DIR__ . '/..' . '/symfony/runtime/RunnerInterface.php', - 'Symfony\\Component\\Runtime\\Runner\\ClosureRunner' => __DIR__ . '/..' . '/symfony/runtime/Runner/ClosureRunner.php', - 'Symfony\\Component\\Runtime\\Runner\\Symfony\\ConsoleApplicationRunner' => __DIR__ . '/..' . '/symfony/runtime/Runner/Symfony/ConsoleApplicationRunner.php', - 'Symfony\\Component\\Runtime\\Runner\\Symfony\\HttpKernelRunner' => __DIR__ . '/..' . '/symfony/runtime/Runner/Symfony/HttpKernelRunner.php', - 'Symfony\\Component\\Runtime\\Runner\\Symfony\\ResponseRunner' => __DIR__ . '/..' . '/symfony/runtime/Runner/Symfony/ResponseRunner.php', - 'Symfony\\Component\\Runtime\\RuntimeInterface' => __DIR__ . '/..' . '/symfony/runtime/RuntimeInterface.php', - 'Symfony\\Component\\Runtime\\SymfonyRuntime' => __DIR__ . '/..' . '/symfony/runtime/SymfonyRuntime.php', 'Symfony\\Component\\Security\\Core\\AuthenticationEvents' => __DIR__ . '/..' . '/symfony/security-core/AuthenticationEvents.php', 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationTrustResolver' => __DIR__ . '/..' . '/symfony/security-core/Authentication/AuthenticationTrustResolver.php', 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationTrustResolverInterface' => __DIR__ . '/..' . '/symfony/security-core/Authentication/AuthenticationTrustResolverInterface.php', @@ -3532,7 +3503,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Symfony\\Component\\VarDumper\\Cloner\\Cursor' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Cursor.php', 'Symfony\\Component\\VarDumper\\Cloner\\Data' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Data.php', 'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/DumperInterface.php', - 'Symfony\\Component\\VarDumper\\Cloner\\Internal\\NoDefault' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Internal/NoDefault.php', 'Symfony\\Component\\VarDumper\\Cloner\\Stub' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Stub.php', 'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/VarCloner.php', 'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php', @@ -3643,13 +3613,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Normalizer.php', 'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php', 'Symfony\\Polyfill\\Php83\\Php83' => __DIR__ . '/..' . '/symfony/polyfill-php83/Php83.php', - 'Symfony\\Runtime\\Symfony\\Component\\Console\\ApplicationRuntime' => __DIR__ . '/..' . '/symfony/runtime/Internal/Console/ApplicationRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\Console\\Command\\CommandRuntime' => __DIR__ . '/..' . '/symfony/runtime/Internal/Console/Command/CommandRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\Console\\Input\\InputInterfaceRuntime' => __DIR__ . '/..' . '/symfony/runtime/Internal/Console/Input/InputInterfaceRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\Console\\Output\\OutputInterfaceRuntime' => __DIR__ . '/..' . '/symfony/runtime/Internal/Console/Output/OutputInterfaceRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\HttpFoundation\\RequestRuntime' => __DIR__ . '/..' . '/symfony/runtime/Internal/HttpFoundation/RequestRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\HttpFoundation\\ResponseRuntime' => __DIR__ . '/..' . '/symfony/runtime/Internal/HttpFoundation/ResponseRuntime.php', - 'Symfony\\Runtime\\Symfony\\Component\\HttpKernel\\HttpKernelInterfaceRuntime' => __DIR__ . '/..' . '/symfony/runtime/Internal/HttpKernel/HttpKernelInterfaceRuntime.php', 'SynchroExceptionNotStarted' => __DIR__ . '/../..' . '/application/exceptions/SynchroExceptionNotStarted.php', 'System' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/System.php', 'TCPDF' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf.php', diff --git a/lib/composer/installed.json b/lib/composer/installed.json index 42b10688a..5ef18f98a 100644 --- a/lib/composer/installed.json +++ b/lib/composer/installed.json @@ -2228,83 +2228,6 @@ ], "install-path": "../symfony/css-selector" }, - { - "name": "symfony/debug-bundle", - "version": "v6.4.13", - "version_normalized": "6.4.13.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug-bundle.git", - "reference": "7bcfaff39e094cc09455201916d016d9b2ae08ff" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/7bcfaff39e094cc09455201916d016d9b2ae08ff", - "reference": "7bcfaff39e094cc09455201916d016d9b2ae08ff", - "shasum": "" - }, - "require": { - "ext-xml": "*", - "php": ">=8.1", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0", - "symfony/twig-bridge": "^5.4|^6.0|^7.0", - "symfony/var-dumper": "^5.4|^6.0|^7.0" - }, - "conflict": { - "symfony/config": "<5.4", - "symfony/dependency-injection": "<5.4" - }, - "require-dev": { - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/web-profiler-bundle": "^5.4|^6.0|^7.0" - }, - "time": "2024-09-25T14:18:03+00:00", - "type": "symfony-bundle", - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Bundle\\DebugBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/debug-bundle/tree/v6.4.13" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "install-path": "../symfony/debug-bundle" - }, { "name": "symfony/dependency-injection", "version": "v6.4.25", @@ -4611,92 +4534,6 @@ ], "install-path": "../symfony/routing" }, - { - "name": "symfony/runtime", - "version": "v6.4.24", - "version_normalized": "6.4.24.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/runtime.git", - "reference": "c1cc6721646f546627236c57f835272806087337" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/runtime/zipball/c1cc6721646f546627236c57f835272806087337", - "reference": "c1cc6721646f546627236c57f835272806087337", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0|^2.0", - "php": ">=8.1" - }, - "conflict": { - "symfony/dotenv": "<5.4" - }, - "require-dev": { - "composer/composer": "^1.0.2|^2.0", - "symfony/console": "^5.4.9|^6.0.9|^7.0", - "symfony/dotenv": "^5.4|^6.0|^7.0", - "symfony/http-foundation": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0" - }, - "time": "2025-07-10T08:14:14+00:00", - "type": "composer-plugin", - "extra": { - "class": "Symfony\\Component\\Runtime\\Internal\\ComposerPlugin" - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\Runtime\\": "", - "Symfony\\Runtime\\Symfony\\Component\\": "Internal/" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Enables decoupling PHP applications from global state", - "homepage": "https://symfony.com", - "keywords": [ - "runtime" - ], - "support": { - "source": "https://github.com/symfony/runtime/tree/v6.4.24" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://github.com/nicolas-grekas", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "install-path": "../symfony/runtime" - }, { "name": "symfony/security-core", "version": "v6.4.26", @@ -5403,17 +5240,17 @@ }, { "name": "symfony/var-dumper", - "version": "v6.4.25", - "version_normalized": "6.4.25.0", + "version": "v6.4.26", + "version_normalized": "6.4.26.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c" + "reference": "cfae1497a2f1eaad78dbc0590311c599c7178d4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6cd92486e9fc32506370822c57bc02353a5a92c", - "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cfae1497a2f1eaad78dbc0590311c599c7178d4a", + "reference": "cfae1497a2f1eaad78dbc0590311c599c7178d4a", "shasum": "" }, "require": { @@ -5432,7 +5269,7 @@ "symfony/uid": "^5.4|^6.0|^7.0", "twig/twig": "^2.13|^3.0.4" }, - "time": "2025-08-13T09:41:44+00:00", + "time": "2025-09-25T15:37:27+00:00", "bin": [ "Resources/bin/var-dump-server" ], @@ -5470,7 +5307,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.25" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.26" }, "funding": [ { @@ -5966,7 +5803,6 @@ ], "dev": true, "dev-package-names": [ - "symfony/debug-bundle", "symfony/stopwatch", "symfony/web-profiler-bundle" ] diff --git a/lib/composer/installed.php b/lib/composer/installed.php index e7f922b19..33b2f7d8a 100644 --- a/lib/composer/installed.php +++ b/lib/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'combodo/itop', 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', - 'reference' => '6183a9d3f3accabe858d865d1050861c1b0d57ef', + 'reference' => '19d062aa830b6d6c7d17ac4046fc9ee2c5e3fab1', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -22,7 +22,7 @@ 'combodo/itop' => array( 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', - 'reference' => '6183a9d3f3accabe858d865d1050861c1b0d57ef', + 'reference' => '19d062aa830b6d6c7d17ac4046fc9ee2c5e3fab1', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -360,15 +360,6 @@ 'aliases' => array(), 'dev_requirement' => false, ), - 'symfony/debug-bundle' => array( - 'pretty_version' => 'v6.4.13', - 'version' => '6.4.13.0', - 'reference' => '7bcfaff39e094cc09455201916d016d9b2ae08ff', - 'type' => 'symfony-bundle', - 'install_path' => __DIR__ . '/../symfony/debug-bundle', - 'aliases' => array(), - 'dev_requirement' => true, - ), 'symfony/dependency-injection' => array( 'pretty_version' => 'v6.4.25', 'version' => '6.4.25.0', @@ -609,15 +600,6 @@ 'aliases' => array(), 'dev_requirement' => false, ), - 'symfony/runtime' => array( - 'pretty_version' => 'v6.4.24', - 'version' => '6.4.24.0', - 'reference' => 'c1cc6721646f546627236c57f835272806087337', - 'type' => 'composer-plugin', - 'install_path' => __DIR__ . '/../symfony/runtime', - 'aliases' => array(), - 'dev_requirement' => false, - ), 'symfony/security-core' => array( 'pretty_version' => 'v6.4.26', 'version' => '6.4.26.0', @@ -697,9 +679,9 @@ 'dev_requirement' => false, ), 'symfony/var-dumper' => array( - 'pretty_version' => 'v6.4.25', - 'version' => '6.4.25.0', - 'reference' => 'c6cd92486e9fc32506370822c57bc02353a5a92c', + 'pretty_version' => 'v6.4.26', + 'version' => '6.4.26.0', + 'reference' => 'cfae1497a2f1eaad78dbc0590311c599c7178d4a', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/var-dumper', 'aliases' => array(), diff --git a/lib/symfony/debug-bundle/CHANGELOG.md b/lib/symfony/debug-bundle/CHANGELOG.md deleted file mode 100644 index 685dd1d07..000000000 --- a/lib/symfony/debug-bundle/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -CHANGELOG -========= - -4.1.0 ------ - - * Added the `server:dump` command to run a server collecting and displaying - dumps on a single place with multiple formats support diff --git a/lib/symfony/debug-bundle/Command/ServerDumpPlaceholderCommand.php b/lib/symfony/debug-bundle/Command/ServerDumpPlaceholderCommand.php deleted file mode 100644 index 69ee83d18..000000000 --- a/lib/symfony/debug-bundle/Command/ServerDumpPlaceholderCommand.php +++ /dev/null @@ -1,54 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bundle\DebugBundle\Command; - -use Symfony\Component\Console\Attribute\AsCommand; -use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Style\SymfonyStyle; -use Symfony\Component\VarDumper\Command\ServerDumpCommand; -use Symfony\Component\VarDumper\Server\DumpServer; - -/** - * A placeholder command easing VarDumper server discovery. - * - * @author Maxime Steinhausser - * - * @internal - */ -#[AsCommand(name: 'server:dump', description: 'Start a dump server that collects and displays dumps in a single place')] -class ServerDumpPlaceholderCommand extends Command -{ - private ServerDumpCommand $replacedCommand; - - public function __construct(?DumpServer $server = null, array $descriptors = []) - { - $this->replacedCommand = new ServerDumpCommand((new \ReflectionClass(DumpServer::class))->newInstanceWithoutConstructor(), $descriptors); - - parent::__construct(); - } - - protected function configure(): void - { - $this->setDefinition($this->replacedCommand->getDefinition()); - $this->setHelp($this->replacedCommand->getHelp()); - $this->setDescription($this->replacedCommand->getDescription()); - } - - protected function execute(InputInterface $input, OutputInterface $output): int - { - (new SymfonyStyle($input, $output))->getErrorStyle()->warning('In order to use the VarDumper server, set the "debug.dump_destination" config option to "tcp://%env(VAR_DUMPER_SERVER)%"'); - - return 8; - } -} diff --git a/lib/symfony/debug-bundle/DebugBundle.php b/lib/symfony/debug-bundle/DebugBundle.php deleted file mode 100644 index 0af84fb5a..000000000 --- a/lib/symfony/debug-bundle/DebugBundle.php +++ /dev/null @@ -1,72 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bundle\DebugBundle; - -use Symfony\Bundle\DebugBundle\DependencyInjection\Compiler\DumpDataCollectorPass; -use Symfony\Component\Console\Application; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\VarDumper\VarDumper; - -/** - * @author Nicolas Grekas - */ -class DebugBundle extends Bundle -{ - /** - * @return void - */ - public function boot() - { - if ($this->container->getParameter('kernel.debug')) { - $container = $this->container; - - // This code is here to lazy load the dump stack. This default - // configuration is overridden in CLI mode on 'console.command' event. - // The dump data collector is used by default, so dump output is sent to - // the WDT. In a CLI context, if dump is used too soon, the data collector - // will buffer it, and release it at the end of the script. - VarDumper::setHandler(function ($var, ?string $label = null) use ($container) { - $dumper = $container->get('data_collector.dump'); - $cloner = $container->get('var_dumper.cloner'); - $handler = function ($var, ?string $label = null) use ($dumper, $cloner) { - $var = $cloner->cloneVar($var); - if (null !== $label) { - $var = $var->withContext(['label' => $label]); - } - - $dumper->dump($var); - }; - VarDumper::setHandler($handler); - $handler($var, $label); - }); - } - } - - /** - * @return void - */ - public function build(ContainerBuilder $container) - { - parent::build($container); - - $container->addCompilerPass(new DumpDataCollectorPass()); - } - - /** - * @return void - */ - public function registerCommands(Application $application) - { - // noop - } -} diff --git a/lib/symfony/debug-bundle/DependencyInjection/Compiler/DumpDataCollectorPass.php b/lib/symfony/debug-bundle/DependencyInjection/Compiler/DumpDataCollectorPass.php deleted file mode 100644 index 568107f2f..000000000 --- a/lib/symfony/debug-bundle/DependencyInjection/Compiler/DumpDataCollectorPass.php +++ /dev/null @@ -1,45 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bundle\DebugBundle\DependencyInjection\Compiler; - -use Symfony\Bundle\WebProfilerBundle\EventListener\WebDebugToolbarListener; -use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Reference; - -/** - * Registers the file link format for the {@link \Symfony\Component\HttpKernel\DataCollector\DumpDataCollector}. - * - * @author Christian Flothmann - */ -class DumpDataCollectorPass implements CompilerPassInterface -{ - /** - * @return void - */ - public function process(ContainerBuilder $container) - { - if (!$container->hasDefinition('data_collector.dump')) { - return; - } - - $definition = $container->getDefinition('data_collector.dump'); - - if (!$container->has('.virtual_request_stack')) { - $definition->replaceArgument(3, new Reference('request_stack')); - } - - if (!$container->hasParameter('web_profiler.debug_toolbar.mode') || WebDebugToolbarListener::DISABLED === $container->getParameter('web_profiler.debug_toolbar.mode')) { - $definition->replaceArgument(3, null); - } - } -} diff --git a/lib/symfony/debug-bundle/DependencyInjection/Configuration.php b/lib/symfony/debug-bundle/DependencyInjection/Configuration.php deleted file mode 100644 index caf735969..000000000 --- a/lib/symfony/debug-bundle/DependencyInjection/Configuration.php +++ /dev/null @@ -1,60 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bundle\DebugBundle\DependencyInjection; - -use Symfony\Component\Config\Definition\Builder\TreeBuilder; -use Symfony\Component\Config\Definition\ConfigurationInterface; - -/** - * DebugExtension configuration structure. - * - * @author Nicolas Grekas - */ -class Configuration implements ConfigurationInterface -{ - public function getConfigTreeBuilder(): TreeBuilder - { - $treeBuilder = new TreeBuilder('debug'); - - $rootNode = $treeBuilder->getRootNode(); - $rootNode->children() - ->integerNode('max_items') - ->info('Max number of displayed items past the first level, -1 means no limit') - ->min(-1) - ->defaultValue(2500) - ->end() - ->integerNode('min_depth') - ->info('Minimum tree depth to clone all the items, 1 is default') - ->min(0) - ->defaultValue(1) - ->end() - ->integerNode('max_string_length') - ->info('Max length of displayed strings, -1 means no limit') - ->min(-1) - ->defaultValue(-1) - ->end() - ->scalarNode('dump_destination') - ->info('A stream URL where dumps should be written to') - ->example('php://stderr, or tcp://%env(VAR_DUMPER_SERVER)% when using the "server:dump" command') - ->defaultNull() - ->end() - ->enumNode('theme') - ->info('Changes the color of the dump() output when rendered directly on the templating. "dark" (default) or "light"') - ->example('dark') - ->values(['dark', 'light']) - ->defaultValue('dark') - ->end() - ; - - return $treeBuilder; - } -} diff --git a/lib/symfony/debug-bundle/DependencyInjection/DebugExtension.php b/lib/symfony/debug-bundle/DependencyInjection/DebugExtension.php deleted file mode 100644 index d00d6111c..000000000 --- a/lib/symfony/debug-bundle/DependencyInjection/DebugExtension.php +++ /dev/null @@ -1,102 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bundle\DebugBundle\DependencyInjection; - -use Symfony\Bridge\Monolog\Command\ServerLogCommand; -use Symfony\Bundle\DebugBundle\Command\ServerDumpPlaceholderCommand; -use Symfony\Component\Config\FileLocator; -use Symfony\Component\Console\Command\Command; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Extension\Extension; -use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; -use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\VarDumper\Caster\ReflectionCaster; - -/** - * DebugExtension. - * - * @author Nicolas Grekas - */ -class DebugExtension extends Extension -{ - /** - * @return void - */ - public function load(array $configs, ContainerBuilder $container) - { - $configuration = new Configuration(); - $config = $this->processConfiguration($configuration, $configs); - - $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); - $loader->load('services.php'); - - $container->getDefinition('var_dumper.cloner') - ->addMethodCall('setMaxItems', [$config['max_items']]) - ->addMethodCall('setMinDepth', [$config['min_depth']]) - ->addMethodCall('setMaxString', [$config['max_string_length']]) - ->addMethodCall('addCasters', [ReflectionCaster::UNSET_CLOSURE_FILE_INFO]); - - if ('dark' !== $config['theme']) { - $container->getDefinition('var_dumper.html_dumper') - ->addMethodCall('setTheme', [$config['theme']]); - } - - if (null === $config['dump_destination']) { - $container->getDefinition('var_dumper.command.server_dump') - ->setClass(ServerDumpPlaceholderCommand::class) - ; - } elseif (str_starts_with($config['dump_destination'], 'tcp://')) { - $container->getDefinition('debug.dump_listener') - ->replaceArgument(2, new Reference('var_dumper.server_connection')) - ; - $container->getDefinition('data_collector.dump') - ->replaceArgument(4, new Reference('var_dumper.server_connection')) - ; - $container->getDefinition('var_dumper.dump_server') - ->replaceArgument(0, $config['dump_destination']) - ; - $container->getDefinition('var_dumper.server_connection') - ->replaceArgument(0, $config['dump_destination']) - ; - } else { - $container->getDefinition('var_dumper.cli_dumper') - ->replaceArgument(0, $config['dump_destination']) - ; - $container->getDefinition('data_collector.dump') - ->replaceArgument(4, new Reference('var_dumper.cli_dumper')) - ; - $container->getDefinition('var_dumper.command.server_dump') - ->setClass(ServerDumpPlaceholderCommand::class) - ; - } - - $container->getDefinition('var_dumper.cli_dumper') - ->addMethodCall('setDisplayOptions', [[ - 'fileLinkFormat' => new Reference('debug.file_link_formatter', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), - ]]) - ; - - if (!class_exists(Command::class) || !class_exists(ServerLogCommand::class)) { - $container->removeDefinition('monolog.command.server_log'); - } - } - - public function getXsdValidationBasePath(): string|false - { - return __DIR__.'/../Resources/config/schema'; - } - - public function getNamespace(): string - { - return 'http://symfony.com/schema/dic/debug'; - } -} diff --git a/lib/symfony/debug-bundle/LICENSE b/lib/symfony/debug-bundle/LICENSE deleted file mode 100644 index 29f72d5e9..000000000 --- a/lib/symfony/debug-bundle/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2014-present Fabien Potencier - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/lib/symfony/debug-bundle/README.md b/lib/symfony/debug-bundle/README.md deleted file mode 100644 index bed2f5b6d..000000000 --- a/lib/symfony/debug-bundle/README.md +++ /dev/null @@ -1,13 +0,0 @@ -DebugBundle -=========== - -DebugBundle provides a tight integration of the Symfony VarDumper component and -the ServerLogCommand from MonologBridge into the Symfony full-stack framework. - -Resources ---------- - - * [Contributing](https://symfony.com/doc/current/contributing/index.html) - * [Report issues](https://github.com/symfony/symfony/issues) and - [send Pull Requests](https://github.com/symfony/symfony/pulls) - in the [main Symfony repository](https://github.com/symfony/symfony) diff --git a/lib/symfony/debug-bundle/Resources/config/schema/debug-1.0.xsd b/lib/symfony/debug-bundle/Resources/config/schema/debug-1.0.xsd deleted file mode 100644 index 323068860..000000000 --- a/lib/symfony/debug-bundle/Resources/config/schema/debug-1.0.xsd +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - diff --git a/lib/symfony/debug-bundle/Resources/config/services.php b/lib/symfony/debug-bundle/Resources/config/services.php deleted file mode 100644 index ea2d05731..000000000 --- a/lib/symfony/debug-bundle/Resources/config/services.php +++ /dev/null @@ -1,140 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\DependencyInjection\Loader\Configurator; - -use Monolog\Formatter\FormatterInterface; -use Symfony\Bridge\Monolog\Command\ServerLogCommand; -use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter; -use Symfony\Bridge\Twig\Extension\DumpExtension; -use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector; -use Symfony\Component\HttpKernel\EventListener\DumpListener; -use Symfony\Component\VarDumper\Cloner\VarCloner; -use Symfony\Component\VarDumper\Command\Descriptor\CliDescriptor; -use Symfony\Component\VarDumper\Command\Descriptor\HtmlDescriptor; -use Symfony\Component\VarDumper\Command\ServerDumpCommand; -use Symfony\Component\VarDumper\Dumper\CliDumper; -use Symfony\Component\VarDumper\Dumper\ContextProvider\CliContextProvider; -use Symfony\Component\VarDumper\Dumper\ContextProvider\RequestContextProvider; -use Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider; -use Symfony\Component\VarDumper\Dumper\ContextualizedDumper; -use Symfony\Component\VarDumper\Dumper\HtmlDumper; -use Symfony\Component\VarDumper\Server\Connection; -use Symfony\Component\VarDumper\Server\DumpServer; - -return static function (ContainerConfigurator $container) { - $container->parameters() - ->set('env(VAR_DUMPER_SERVER)', '127.0.0.1:9912') - ; - - $container->services() - - ->set('twig.extension.dump', DumpExtension::class) - ->args([ - service('var_dumper.cloner'), - service('var_dumper.html_dumper'), - ]) - ->tag('twig.extension') - - ->set('data_collector.dump', DumpDataCollector::class) - ->public() - ->args([ - service('debug.stopwatch')->ignoreOnInvalid(), - service('debug.file_link_formatter')->ignoreOnInvalid(), - param('kernel.charset'), - service('.virtual_request_stack'), - null, // var_dumper.cli_dumper or var_dumper.server_connection when debug.dump_destination is set - ]) - ->tag('data_collector', [ - 'id' => 'dump', - 'template' => '@Debug/Profiler/dump.html.twig', - 'priority' => 240, - ]) - - ->set('debug.dump_listener', DumpListener::class) - ->args([ - service('var_dumper.cloner'), - service('var_dumper.cli_dumper'), - null, - ]) - ->tag('kernel.event_subscriber') - - ->set('var_dumper.cloner', VarCloner::class) - ->public() - - ->set('var_dumper.cli_dumper', CliDumper::class) - ->args([ - null, // debug.dump_destination, - param('kernel.charset'), - 0, // flags - ]) - - ->set('var_dumper.contextualized_cli_dumper', ContextualizedDumper::class) - ->decorate('var_dumper.cli_dumper') - ->args([ - service('var_dumper.contextualized_cli_dumper.inner'), - [ - 'source' => inline_service(SourceContextProvider::class)->args([ - param('kernel.charset'), - param('kernel.project_dir'), - service('debug.file_link_formatter')->nullOnInvalid(), - ]), - ], - ]) - - ->set('var_dumper.html_dumper', HtmlDumper::class) - ->args([ - null, - param('kernel.charset'), - 0, // flags - ]) - ->call('setDisplayOptions', [ - ['fileLinkFormat' => service('debug.file_link_formatter')->ignoreOnInvalid()], - ]) - - ->set('var_dumper.server_connection', Connection::class) - ->args([ - '', // server host - [ - 'source' => inline_service(SourceContextProvider::class)->args([ - param('kernel.charset'), - param('kernel.project_dir'), - service('debug.file_link_formatter')->nullOnInvalid(), - ]), - 'request' => inline_service(RequestContextProvider::class)->args([service('request_stack')]), - 'cli' => inline_service(CliContextProvider::class), - ], - ]) - - ->set('var_dumper.dump_server', DumpServer::class) - ->args([ - '', // server host - service('logger')->nullOnInvalid(), - ]) - ->tag('monolog.logger', ['channel' => 'debug']) - - ->set('var_dumper.command.server_dump', ServerDumpCommand::class) - ->args([ - service('var_dumper.dump_server'), - [ - 'cli' => inline_service(CliDescriptor::class)->args([service('var_dumper.contextualized_cli_dumper.inner')]), - 'html' => inline_service(HtmlDescriptor::class)->args([service('var_dumper.html_dumper')]), - ], - ]) - ->tag('console.command') - - ->set('monolog.command.server_log', ServerLogCommand::class) - ; - - if (class_exists(ConsoleFormatter::class) && interface_exists(FormatterInterface::class)) { - $container->services()->get('monolog.command.server_log')->tag('console.command'); - } -}; diff --git a/lib/symfony/debug-bundle/Resources/views/Profiler/dump.html.twig b/lib/symfony/debug-bundle/Resources/views/Profiler/dump.html.twig deleted file mode 100644 index e98e52474..000000000 --- a/lib/symfony/debug-bundle/Resources/views/Profiler/dump.html.twig +++ /dev/null @@ -1,83 +0,0 @@ -{% extends '@WebProfiler/Profiler/layout.html.twig' %} - -{% block toolbar %} - {% if collector.dumpsCount %} - {% set icon %} - {{ source('@Debug/Profiler/icon.svg') }} - {{ collector.dumpsCount }} - {% endset %} - - {% set text %} - {% for dump in collector.getDumps('html') %} -
- - {% if dump.label is defined and '' != dump.label %} - {{ dump.label }} in - {% endif %} - {% if dump.file %} - {% set link = dump.file|file_link(dump.line) %} - {% if link %} - {{ dump.name }} - {% else %} - {{ dump.name }} - {% endif %} - {% else %} - {{ dump.name }} - {% endif %} - - line {{ dump.line }} - - {{ dump.data|raw }} -
- {% endfor %} - {% endset %} - - {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { 'link': true }) }} - {% endif %} -{% endblock %} - -{% block menu %} - - {{ source('@Debug/Profiler/icon.svg') }} - Debug - -{% endblock %} - -{% block panel %} -

Dumped Contents

- - {% for dump in collector.getDumps('html') %} -
- - {% if dump.label is defined and '' != dump.label %} - {{ dump.label }} in - {% else %} - In - {% endif %} - {% if dump.line %} - {% set link = dump.file|file_link(dump.line) %} - {% if link %} - {{ dump.name }} - {% else %} - {{ dump.name }} - {% endif %} - {% else %} - {{ dump.name }} - {% endif %} - line {{ dump.line }}: - - - - - {{ dump.data|raw }} -
- {% else %} -
-

No content was dumped.

-
- {% endfor %} -{% endblock %} diff --git a/lib/symfony/debug-bundle/Resources/views/Profiler/icon.svg b/lib/symfony/debug-bundle/Resources/views/Profiler/icon.svg deleted file mode 100644 index 9ba3a7d94..000000000 --- a/lib/symfony/debug-bundle/Resources/views/Profiler/icon.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/lib/symfony/debug-bundle/composer.json b/lib/symfony/debug-bundle/composer.json deleted file mode 100644 index 1d058228f..000000000 --- a/lib/symfony/debug-bundle/composer.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "symfony/debug-bundle", - "type": "symfony-bundle", - "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework", - "keywords": [], - "homepage": "https://symfony.com", - "license": "MIT", - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-xml": "*", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0", - "symfony/twig-bridge": "^5.4|^6.0|^7.0", - "symfony/var-dumper": "^5.4|^6.0|^7.0" - }, - "require-dev": { - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/web-profiler-bundle": "^5.4|^6.0|^7.0" - }, - "conflict": { - "symfony/config": "<5.4", - "symfony/dependency-injection": "<5.4" - }, - "autoload": { - "psr-4": { "Symfony\\Bundle\\DebugBundle\\": "" }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "minimum-stability": "dev" -} diff --git a/lib/symfony/runtime/CHANGELOG.md b/lib/symfony/runtime/CHANGELOG.md deleted file mode 100644 index 1a608b4cf..000000000 --- a/lib/symfony/runtime/CHANGELOG.md +++ /dev/null @@ -1,19 +0,0 @@ -CHANGELOG -========= - -6.4 ---- - - * Add argument `bool $debug = false` to `HttpKernelRunner::__construct()` - -5.4 ---- - - * The component is not experimental anymore - * Add options "env_var_name" and "debug_var_name" to `GenericRuntime` and `SymfonyRuntime` - * Add option "dotenv_overload" to `SymfonyRuntime` - -5.3.0 ------ - - * Add the component diff --git a/lib/symfony/runtime/GenericRuntime.php b/lib/symfony/runtime/GenericRuntime.php deleted file mode 100644 index b432630d1..000000000 --- a/lib/symfony/runtime/GenericRuntime.php +++ /dev/null @@ -1,223 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime; - -use Symfony\Component\Runtime\Internal\BasicErrorHandler; -use Symfony\Component\Runtime\Resolver\ClosureResolver; -use Symfony\Component\Runtime\Resolver\DebugClosureResolver; -use Symfony\Component\Runtime\Runner\ClosureRunner; - -// Help opcache.preload discover always-needed symbols -class_exists(ClosureResolver::class); - -/** - * A runtime to do bare-metal PHP without using superglobals. - * - * It supports the following options: - * - "debug" toggles displaying errors and defaults - * to the "APP_DEBUG" environment variable; - * - "runtimes" maps types to a GenericRuntime implementation - * that knows how to deal with each of them; - * - "error_handler" defines the class to use to handle PHP errors; - * - "env_var_name" and "debug_var_name" define the name of the env - * vars that hold the Symfony env and the debug flag respectively. - * - * The app-callable can declare arguments among either: - * - "array $context" to get a local array similar to $_SERVER; - * - "array $argv" to get the command line arguments when running on the CLI; - * - "array $request" to get a local array with keys "query", "body", "files" and - * "session", which map to $_GET, $_POST, $FILES and &$_SESSION respectively. - * - * It should return a Closure():int|string|null or an instance of RunnerInterface. - * - * In debug mode, the runtime registers a strict error handler - * that throws exceptions when a PHP warning/notice is raised. - * - * @author Nicolas Grekas - */ -class GenericRuntime implements RuntimeInterface -{ - protected $options; - - /** - * @param array { - * debug?: ?bool, - * runtimes?: ?array, - * error_handler?: string|false, - * env_var_name?: string, - * debug_var_name?: string, - * } $options - */ - public function __construct(array $options = []) - { - $options['env_var_name'] ??= 'APP_ENV'; - $debugKey = $options['debug_var_name'] ??= 'APP_DEBUG'; - - $debug = $options['debug'] ?? $_SERVER[$debugKey] ?? $_ENV[$debugKey] ?? true; - - if (!\is_bool($debug)) { - $debug = filter_var($debug, \FILTER_VALIDATE_BOOL); - } - - if ($debug) { - umask(0000); - $_SERVER[$debugKey] = $_ENV[$debugKey] = '1'; - } else { - $_SERVER[$debugKey] = $_ENV[$debugKey] = '0'; - } - - if (false !== $errorHandler = ($options['error_handler'] ?? BasicErrorHandler::class)) { - $errorHandler::register($debug); - $options['error_handler'] = false; - } - - $this->options = $options; - } - - public function getResolver(callable $callable, ?\ReflectionFunction $reflector = null): ResolverInterface - { - $callable = $callable(...); - $parameters = ($reflector ?? new \ReflectionFunction($callable))->getParameters(); - $arguments = function () use ($parameters) { - $arguments = []; - - try { - foreach ($parameters as $parameter) { - $type = $parameter->getType(); - $arguments[] = $this->getArgument($parameter, $type instanceof \ReflectionNamedType ? $type->getName() : null); - } - } catch (\InvalidArgumentException $e) { - if (!$parameter->isOptional()) { - throw $e; - } - } - - return $arguments; - }; - - if ($_SERVER[$this->options['debug_var_name']]) { - return new DebugClosureResolver($callable, $arguments); - } - - return new ClosureResolver($callable, $arguments); - } - - public function getRunner(?object $application): RunnerInterface - { - $application ??= static fn () => 0; - - if ($application instanceof RunnerInterface) { - return $application; - } - - if (!$application instanceof \Closure) { - if ($runtime = $this->resolveRuntime($application::class)) { - return $runtime->getRunner($application); - } - - if (!\is_callable($application)) { - throw new \LogicException(\sprintf('"%s" doesn\'t know how to handle apps of type "%s".', get_debug_type($this), get_debug_type($application))); - } - - $application = $application(...); - } - - if ($_SERVER[$this->options['debug_var_name']] && ($r = new \ReflectionFunction($application)) && $r->getNumberOfRequiredParameters()) { - throw new \ArgumentCountError(\sprintf('Zero argument should be required by the runner callable, but at least one is in "%s" on line "%d.', $r->getFileName(), $r->getStartLine())); - } - - return new ClosureRunner($application); - } - - protected function getArgument(\ReflectionParameter $parameter, ?string $type): mixed - { - if ('array' === $type) { - switch ($parameter->name) { - case 'context': - $context = $_SERVER; - - if ($_ENV && !isset($_SERVER['PATH']) && !isset($_SERVER['Path'])) { - $context += $_ENV; - } - - return $context; - - case 'argv': - return $_SERVER['argv'] ?? []; - - case 'request': - return [ - 'query' => $_GET, - 'body' => $_POST, - 'files' => $_FILES, - 'session' => &$_SESSION, - ]; - } - } - - if (RuntimeInterface::class === $type) { - return $this; - } - - if (!$runtime = $this->getRuntime($type)) { - $r = $parameter->getDeclaringFunction(); - - throw new \InvalidArgumentException(\sprintf('Cannot resolve argument "%s $%s" in "%s" on line "%d": "%s" supports only arguments "array $context", "array $argv" and "array $request", or a runtime named "Symfony\Runtime\%1$sRuntime".', $type, $parameter->name, $r->getFileName(), $r->getStartLine(), get_debug_type($this))); - } - - return $runtime->getArgument($parameter, $type); - } - - protected static function register(self $runtime): self - { - return $runtime; - } - - private function getRuntime(string $type): ?self - { - if (null === $runtime = ($this->options['runtimes'][$type] ?? null)) { - $runtime = 'Symfony\Runtime\\'.$type.'Runtime'; - $runtime = class_exists($runtime) ? $runtime : $this->options['runtimes'][$type] = false; - } - - if (\is_string($runtime)) { - $runtime = $runtime::register($this); - } - - if ($this === $runtime) { - return null; - } - - return $runtime ?: null; - } - - private function resolveRuntime(string $class): ?self - { - if ($runtime = $this->getRuntime($class)) { - return $runtime; - } - - foreach (class_parents($class) as $type) { - if ($runtime = $this->getRuntime($type)) { - return $runtime; - } - } - - foreach (class_implements($class) as $type) { - if ($runtime = $this->getRuntime($type)) { - return $runtime; - } - } - - return null; - } -} diff --git a/lib/symfony/runtime/Internal/BasicErrorHandler.php b/lib/symfony/runtime/Internal/BasicErrorHandler.php deleted file mode 100644 index c0c290e68..000000000 --- a/lib/symfony/runtime/Internal/BasicErrorHandler.php +++ /dev/null @@ -1,53 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime\Internal; - -/** - * @author Nicolas Grekas - * - * @internal - */ -class BasicErrorHandler -{ - public static function register(bool $debug): void - { - error_reporting(\E_ALL & ~\E_DEPRECATED & ~\E_USER_DEPRECATED); - - if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - ini_set('display_errors', $debug); - } elseif (!filter_var(\ini_get('log_errors'), \FILTER_VALIDATE_BOOL) || \ini_get('error_log')) { - // CLI - display errors only if they're not already logged to STDERR - ini_set('display_errors', 1); - } - - if (0 <= \ini_get('zend.assertions')) { - ini_set('zend.assertions', (int) $debug); - } - ini_set('assert.active', 1); - ini_set('assert.exception', 1); - - set_error_handler(new self()); - } - - public function __invoke(int $type, string $message, string $file, int $line): bool - { - if ((\E_DEPRECATED | \E_USER_DEPRECATED) & $type) { - return true; - } - - if ((error_reporting() | \E_ERROR | \E_RECOVERABLE_ERROR | \E_PARSE | \E_CORE_ERROR | \E_COMPILE_ERROR | \E_USER_ERROR) & $type) { - throw new \ErrorException($message, 0, $type, $file, $line); - } - - return false; - } -} diff --git a/lib/symfony/runtime/Internal/ComposerPlugin.php b/lib/symfony/runtime/Internal/ComposerPlugin.php deleted file mode 100644 index cad8d85fc..000000000 --- a/lib/symfony/runtime/Internal/ComposerPlugin.php +++ /dev/null @@ -1,119 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime\Internal; - -use Composer\Composer; -use Composer\EventDispatcher\EventSubscriberInterface; -use Composer\Factory; -use Composer\IO\IOInterface; -use Composer\Plugin\PluginInterface; -use Composer\Script\ScriptEvents; -use Symfony\Component\Filesystem\Filesystem; -use Symfony\Component\Runtime\SymfonyRuntime; - -/** - * @author Nicolas Grekas - * - * @internal - */ -class ComposerPlugin implements PluginInterface, EventSubscriberInterface -{ - private Composer $composer; - private IOInterface $io; - - private static bool $activated = false; - - public function activate(Composer $composer, IOInterface $io): void - { - self::$activated = true; - $this->composer = $composer; - $this->io = $io; - } - - public function deactivate(Composer $composer, IOInterface $io): void - { - self::$activated = false; - } - - public function uninstall(Composer $composer, IOInterface $io): void - { - @unlink($composer->getConfig()->get('vendor-dir').'/autoload_runtime.php'); - } - - public function updateAutoloadFile(): void - { - $vendorDir = realpath($this->composer->getConfig()->get('vendor-dir')); - - if (!is_file($autoloadFile = $vendorDir.'/autoload.php') - || false === $extra = $this->composer->getPackage()->getExtra()['runtime'] ?? [] - ) { - return; - } - - $fs = new Filesystem(); - $projectDir = \dirname(realpath(Factory::getComposerFile())); - - if (null === $autoloadTemplate = $extra['autoload_template'] ?? null) { - $autoloadTemplate = __DIR__.'/autoload_runtime.template'; - } else { - if (!$fs->isAbsolutePath($autoloadTemplate)) { - $autoloadTemplate = $projectDir.'/'.$autoloadTemplate; - } - - if (!is_file($autoloadTemplate)) { - throw new \InvalidArgumentException(\sprintf('File "%s" defined under "extra.runtime.autoload_template" in your composer.json file not found.', $this->composer->getPackage()->getExtra()['runtime']['autoload_template'])); - } - } - - $projectDir = $fs->makePathRelative($projectDir, $vendorDir); - $nestingLevel = 0; - - while (str_starts_with($projectDir, '../')) { - ++$nestingLevel; - $projectDir = substr($projectDir, 3); - } - - if (!$nestingLevel) { - $projectDir = '__'.'DIR__.'.var_export('/'.$projectDir, true); - } else { - $projectDir = 'dirname(__'."DIR__, $nestingLevel)".('' !== $projectDir ? '.'.var_export('/'.$projectDir, true) : ''); - } - - $runtimeClass = $extra['class'] ?? SymfonyRuntime::class; - - unset($extra['class'], $extra['autoload_template']); - - $code = strtr(file_get_contents($autoloadTemplate), [ - '%project_dir%' => $projectDir, - '%runtime_class%' => var_export($runtimeClass, true), - '%runtime_options%' => '['.substr(var_export($extra, true), 7, -1)." 'project_dir' => {$projectDir},\n]", - ]); - - // could use Composer\Util\Filesystem::filePutContentsIfModified once Composer 1.x support is dropped for this plugin - $path = substr_replace($autoloadFile, '_runtime', -4, 0); - $currentContent = @file_exists($path) ? @file_get_contents($path) : false; - if (false === $currentContent || $currentContent !== $code) { - file_put_contents($path, $code); - } - } - - public static function getSubscribedEvents(): array - { - if (!self::$activated) { - return []; - } - - return [ - ScriptEvents::POST_AUTOLOAD_DUMP => 'updateAutoloadFile', - ]; - } -} diff --git a/lib/symfony/runtime/Internal/Console/ApplicationRuntime.php b/lib/symfony/runtime/Internal/Console/ApplicationRuntime.php deleted file mode 100644 index de6b1d974..000000000 --- a/lib/symfony/runtime/Internal/Console/ApplicationRuntime.php +++ /dev/null @@ -1,21 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Runtime\Symfony\Component\Console; - -use Symfony\Component\Runtime\SymfonyRuntime; - -/** - * @internal - */ -class ApplicationRuntime extends SymfonyRuntime -{ -} diff --git a/lib/symfony/runtime/Internal/Console/Command/CommandRuntime.php b/lib/symfony/runtime/Internal/Console/Command/CommandRuntime.php deleted file mode 100644 index 9cc198ea1..000000000 --- a/lib/symfony/runtime/Internal/Console/Command/CommandRuntime.php +++ /dev/null @@ -1,21 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Runtime\Symfony\Component\Console\Command; - -use Symfony\Component\Runtime\SymfonyRuntime; - -/** - * @internal - */ -class CommandRuntime extends SymfonyRuntime -{ -} diff --git a/lib/symfony/runtime/Internal/Console/Input/InputInterfaceRuntime.php b/lib/symfony/runtime/Internal/Console/Input/InputInterfaceRuntime.php deleted file mode 100644 index 44360bf50..000000000 --- a/lib/symfony/runtime/Internal/Console/Input/InputInterfaceRuntime.php +++ /dev/null @@ -1,21 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Runtime\Symfony\Component\Console\Input; - -use Symfony\Component\Runtime\SymfonyRuntime; - -/** - * @internal - */ -class InputInterfaceRuntime extends SymfonyRuntime -{ -} diff --git a/lib/symfony/runtime/Internal/Console/Output/OutputInterfaceRuntime.php b/lib/symfony/runtime/Internal/Console/Output/OutputInterfaceRuntime.php deleted file mode 100644 index 7c59186ad..000000000 --- a/lib/symfony/runtime/Internal/Console/Output/OutputInterfaceRuntime.php +++ /dev/null @@ -1,21 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Runtime\Symfony\Component\Console\Output; - -use Symfony\Component\Runtime\SymfonyRuntime; - -/** - * @internal - */ -class OutputInterfaceRuntime extends SymfonyRuntime -{ -} diff --git a/lib/symfony/runtime/Internal/HttpFoundation/RequestRuntime.php b/lib/symfony/runtime/Internal/HttpFoundation/RequestRuntime.php deleted file mode 100644 index 2a3a0bb82..000000000 --- a/lib/symfony/runtime/Internal/HttpFoundation/RequestRuntime.php +++ /dev/null @@ -1,21 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Runtime\Symfony\Component\HttpFoundation; - -use Symfony\Component\Runtime\SymfonyRuntime; - -/** - * @internal - */ -class RequestRuntime extends SymfonyRuntime -{ -} diff --git a/lib/symfony/runtime/Internal/HttpFoundation/ResponseRuntime.php b/lib/symfony/runtime/Internal/HttpFoundation/ResponseRuntime.php deleted file mode 100644 index c70fbfff5..000000000 --- a/lib/symfony/runtime/Internal/HttpFoundation/ResponseRuntime.php +++ /dev/null @@ -1,21 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Runtime\Symfony\Component\HttpFoundation; - -use Symfony\Component\Runtime\SymfonyRuntime; - -/** - * @internal - */ -class ResponseRuntime extends SymfonyRuntime -{ -} diff --git a/lib/symfony/runtime/Internal/HttpKernel/HttpKernelInterfaceRuntime.php b/lib/symfony/runtime/Internal/HttpKernel/HttpKernelInterfaceRuntime.php deleted file mode 100644 index 08601abff..000000000 --- a/lib/symfony/runtime/Internal/HttpKernel/HttpKernelInterfaceRuntime.php +++ /dev/null @@ -1,21 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Runtime\Symfony\Component\HttpKernel; - -use Symfony\Component\Runtime\SymfonyRuntime; - -/** - * @internal - */ -class HttpKernelInterfaceRuntime extends SymfonyRuntime -{ -} diff --git a/lib/symfony/runtime/Internal/MissingDotenv.php b/lib/symfony/runtime/Internal/MissingDotenv.php deleted file mode 100644 index 896865653..000000000 --- a/lib/symfony/runtime/Internal/MissingDotenv.php +++ /dev/null @@ -1,19 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime\Internal; - -/** - * @internal class that should be loaded only when symfony/dotenv is not installed - */ -class MissingDotenv -{ -} diff --git a/lib/symfony/runtime/Internal/SymfonyErrorHandler.php b/lib/symfony/runtime/Internal/SymfonyErrorHandler.php deleted file mode 100644 index 47c67605b..000000000 --- a/lib/symfony/runtime/Internal/SymfonyErrorHandler.php +++ /dev/null @@ -1,54 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime\Internal; - -use Symfony\Component\ErrorHandler\BufferingLogger; -use Symfony\Component\ErrorHandler\DebugClassLoader; -use Symfony\Component\ErrorHandler\ErrorHandler; - -/** - * @author Nicolas Grekas - * - * @internal - */ -class SymfonyErrorHandler -{ - public static function register(bool $debug): void - { - if (!class_exists(ErrorHandler::class)) { - BasicErrorHandler::register($debug); - - return; - } - - error_reporting(\E_ALL & ~\E_DEPRECATED & ~\E_USER_DEPRECATED); - - if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - ini_set('display_errors', $debug); - } elseif (!filter_var(\ini_get('log_errors'), \FILTER_VALIDATE_BOOL) || \ini_get('error_log')) { - // CLI - display errors only if they're not already logged to STDERR - ini_set('display_errors', 1); - } - - if (0 <= \ini_get('zend.assertions')) { - ini_set('zend.assertions', (int) $debug); - } - ini_set('assert.active', 1); - ini_set('assert.exception', 1); - - if ($debug) { - DebugClassLoader::enable(); - } - - ErrorHandler::register(new ErrorHandler(new BufferingLogger(), $debug)); - } -} diff --git a/lib/symfony/runtime/Internal/autoload_runtime.template b/lib/symfony/runtime/Internal/autoload_runtime.template deleted file mode 100644 index 68af94593..000000000 --- a/lib/symfony/runtime/Internal/autoload_runtime.template +++ /dev/null @@ -1,28 +0,0 @@ -getResolver($app) - ->resolve(); - -$app = $app(...$args); - -exit( - $runtime - ->getRunner($app) - ->run() -); diff --git a/lib/symfony/runtime/LICENSE b/lib/symfony/runtime/LICENSE deleted file mode 100644 index 99c6bdf35..000000000 --- a/lib/symfony/runtime/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2021-present Fabien Potencier - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/lib/symfony/runtime/README.md b/lib/symfony/runtime/README.md deleted file mode 100644 index 006e7a22c..000000000 --- a/lib/symfony/runtime/README.md +++ /dev/null @@ -1,13 +0,0 @@ -Runtime Component -================= - -Symfony Runtime enables decoupling applications from global state. - -Resources ---------- - - * [Documentation](https://symfony.com/doc/current/components/runtime.html) - * [Contributing](https://symfony.com/doc/current/contributing/index.html) - * [Report issues](https://github.com/symfony/symfony/issues) and - [send Pull Requests](https://github.com/symfony/symfony/pulls) - in the [main Symfony repository](https://github.com/symfony/symfony) diff --git a/lib/symfony/runtime/Resolver/ClosureResolver.php b/lib/symfony/runtime/Resolver/ClosureResolver.php deleted file mode 100644 index c58cf2fbf..000000000 --- a/lib/symfony/runtime/Resolver/ClosureResolver.php +++ /dev/null @@ -1,31 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime\Resolver; - -use Symfony\Component\Runtime\ResolverInterface; - -/** - * @author Nicolas Grekas - */ -class ClosureResolver implements ResolverInterface -{ - public function __construct( - private readonly \Closure $closure, - private readonly \Closure $arguments, - ) { - } - - public function resolve(): array - { - return [$this->closure, ($this->arguments)()]; - } -} diff --git a/lib/symfony/runtime/Resolver/DebugClosureResolver.php b/lib/symfony/runtime/Resolver/DebugClosureResolver.php deleted file mode 100644 index 026b2731b..000000000 --- a/lib/symfony/runtime/Resolver/DebugClosureResolver.php +++ /dev/null @@ -1,36 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime\Resolver; - -/** - * @author Nicolas Grekas - */ -class DebugClosureResolver extends ClosureResolver -{ - public function resolve(): array - { - [$closure, $arguments] = parent::resolve(); - - return [ - static function (...$arguments) use ($closure) { - if (\is_object($app = $closure(...$arguments)) || null === $app) { - return $app; - } - - $r = new \ReflectionFunction($closure); - - throw new \TypeError(\sprintf('Unexpected value of type "%s" returned, "object" expected from "%s" on line "%d".', get_debug_type($app), $r->getFileName(), $r->getStartLine())); - }, - $arguments, - ]; - } -} diff --git a/lib/symfony/runtime/ResolverInterface.php b/lib/symfony/runtime/ResolverInterface.php deleted file mode 100644 index f6fa5980e..000000000 --- a/lib/symfony/runtime/ResolverInterface.php +++ /dev/null @@ -1,23 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime; - -/** - * @author Nicolas Grekas - */ -interface ResolverInterface -{ - /** - * @return array{0: callable, 1: mixed[]} - */ - public function resolve(): array; -} diff --git a/lib/symfony/runtime/Runner/ClosureRunner.php b/lib/symfony/runtime/Runner/ClosureRunner.php deleted file mode 100644 index 2b54f5a32..000000000 --- a/lib/symfony/runtime/Runner/ClosureRunner.php +++ /dev/null @@ -1,44 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime\Runner; - -use Symfony\Component\Runtime\RunnerInterface; - -/** - * @author Nicolas Grekas - */ -class ClosureRunner implements RunnerInterface -{ - public function __construct( - private readonly \Closure $closure, - ) { - } - - public function run(): int - { - $exitStatus = ($this->closure)(); - - if (\is_string($exitStatus)) { - echo $exitStatus; - - return 0; - } - - if (null !== $exitStatus && !\is_int($exitStatus)) { - $r = new \ReflectionFunction($this->closure); - - throw new \TypeError(\sprintf('Unexpected value of type "%s" returned, "string|int|null" expected from "%s" on line "%d".', get_debug_type($exitStatus), $r->getFileName(), $r->getStartLine())); - } - - return $exitStatus ?? 0; - } -} diff --git a/lib/symfony/runtime/Runner/Symfony/ConsoleApplicationRunner.php b/lib/symfony/runtime/Runner/Symfony/ConsoleApplicationRunner.php deleted file mode 100644 index d64bc1c77..000000000 --- a/lib/symfony/runtime/Runner/Symfony/ConsoleApplicationRunner.php +++ /dev/null @@ -1,51 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime\Runner\Symfony; - -use Symfony\Component\Console\Application; -use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Runtime\RunnerInterface; - -/** - * @author Nicolas Grekas - */ -class ConsoleApplicationRunner implements RunnerInterface -{ - public function __construct( - private readonly Application $application, - private readonly ?string $defaultEnv, - private readonly InputInterface $input, - private readonly ?OutputInterface $output = null, - ) { - } - - public function run(): int - { - if (null === $this->defaultEnv) { - return $this->application->run($this->input, $this->output); - } - - $definition = $this->application->getDefinition(); - - if (!$definition->hasOption('env') && !$definition->hasOption('e') && !$definition->hasShortcut('e')) { - $definition->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'The Environment name.', $this->defaultEnv)); - } - - if (!$definition->hasOption('no-debug')) { - $definition->addOption(new InputOption('--no-debug', null, InputOption::VALUE_NONE, 'Switches off debug mode.')); - } - - return $this->application->run($this->input, $this->output); - } -} diff --git a/lib/symfony/runtime/Runner/Symfony/HttpKernelRunner.php b/lib/symfony/runtime/Runner/Symfony/HttpKernelRunner.php deleted file mode 100644 index 13c9037ca..000000000 --- a/lib/symfony/runtime/Runner/Symfony/HttpKernelRunner.php +++ /dev/null @@ -1,58 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime\Runner\Symfony; - -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\HttpKernel\HttpKernelInterface; -use Symfony\Component\HttpKernel\Kernel; -use Symfony\Component\HttpKernel\TerminableInterface; -use Symfony\Component\Runtime\RunnerInterface; - -/** - * @author Nicolas Grekas - */ -class HttpKernelRunner implements RunnerInterface -{ - public function __construct( - private readonly HttpKernelInterface $kernel, - private readonly Request $request, - private readonly bool $debug = false, - ) { - } - - public function run(): int - { - $response = $this->kernel->handle($this->request); - - if (Kernel::VERSION_ID >= 60400) { - $response->send(false); - - if (\function_exists('fastcgi_finish_request') && !$this->debug) { - fastcgi_finish_request(); - } elseif (\function_exists('litespeed_finish_request') && !$this->debug) { - litespeed_finish_request(); - } else { - Response::closeOutputBuffers(0, true); - flush(); - } - } else { - $response->send(); - } - - if ($this->kernel instanceof TerminableInterface) { - $this->kernel->terminate($this->request, $response); - } - - return 0; - } -} diff --git a/lib/symfony/runtime/Runner/Symfony/ResponseRunner.php b/lib/symfony/runtime/Runner/Symfony/ResponseRunner.php deleted file mode 100644 index 04e5a3fa1..000000000 --- a/lib/symfony/runtime/Runner/Symfony/ResponseRunner.php +++ /dev/null @@ -1,33 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime\Runner\Symfony; - -use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Runtime\RunnerInterface; - -/** - * @author Nicolas Grekas - */ -class ResponseRunner implements RunnerInterface -{ - public function __construct( - private readonly Response $response, - ) { - } - - public function run(): int - { - $this->response->send(); - - return 0; - } -} diff --git a/lib/symfony/runtime/RunnerInterface.php b/lib/symfony/runtime/RunnerInterface.php deleted file mode 100644 index 9001ff435..000000000 --- a/lib/symfony/runtime/RunnerInterface.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime; - -/** - * @author Nicolas Grekas - */ -interface RunnerInterface -{ - public function run(): int; -} diff --git a/lib/symfony/runtime/RuntimeInterface.php b/lib/symfony/runtime/RuntimeInterface.php deleted file mode 100644 index f151757e9..000000000 --- a/lib/symfony/runtime/RuntimeInterface.php +++ /dev/null @@ -1,34 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime; - -/** - * Enables decoupling applications from global state. - * - * @author Nicolas Grekas - */ -interface RuntimeInterface -{ - /** - * Returns a resolver that should compute the arguments of a callable. - * - * The callable itself should return an object that represents the application to pass to the getRunner() method. - */ - public function getResolver(callable $callable, ?\ReflectionFunction $reflector = null): ResolverInterface; - - /** - * Returns a callable that knows how to run the passed object and that returns its exit status as int. - * - * The passed object is typically created by calling ResolverInterface::resolve(). - */ - public function getRunner(?object $application): RunnerInterface; -} diff --git a/lib/symfony/runtime/SymfonyRuntime.php b/lib/symfony/runtime/SymfonyRuntime.php deleted file mode 100644 index ef8393620..000000000 --- a/lib/symfony/runtime/SymfonyRuntime.php +++ /dev/null @@ -1,234 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Runtime; - -use Symfony\Component\Console\Application; -use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\ArgvInput; -use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\ConsoleOutput; -use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Dotenv\Dotenv; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\HttpKernel\HttpKernelInterface; -use Symfony\Component\Runtime\Internal\MissingDotenv; -use Symfony\Component\Runtime\Internal\SymfonyErrorHandler; -use Symfony\Component\Runtime\Runner\Symfony\ConsoleApplicationRunner; -use Symfony\Component\Runtime\Runner\Symfony\HttpKernelRunner; -use Symfony\Component\Runtime\Runner\Symfony\ResponseRunner; - -// Help opcache.preload discover always-needed symbols -class_exists(MissingDotenv::class, false) || class_exists(Dotenv::class) || class_exists(MissingDotenv::class); - -/** - * Knows the basic conventions to run Symfony apps. - * - * In addition to the options managed by GenericRuntime, it accepts the following options: - * - "env" to define the name of the environment the app runs in; - * - "disable_dotenv" to disable looking for .env files; - * - "dotenv_path" to define the path of dot-env files - defaults to ".env"; - * - "prod_envs" to define the names of the production envs - defaults to ["prod"]; - * - "test_envs" to define the names of the test envs - defaults to ["test"]; - * - "use_putenv" to tell Dotenv to set env vars using putenv() (NOT RECOMMENDED.) - * - "dotenv_overload" to tell Dotenv to override existing vars - * - * When the "debug" / "env" options are not defined, they will fallback to the - * "APP_DEBUG" / "APP_ENV" environment variables, and to the "--env|-e" / "--no-debug" - * command line arguments if "symfony/console" is installed. - * - * When the "symfony/dotenv" component is installed, .env files are loaded. - * When "symfony/error-handler" is installed, it is registered in debug mode. - * - * On top of the base arguments provided by GenericRuntime, - * this runtime can feed the app-callable with arguments of type: - * - Request from "symfony/http-foundation" if the component is installed; - * - Application, Command, InputInterface and/or OutputInterface - * from "symfony/console" if the component is installed. - * - * This runtime can handle app-callables that return instances of either: - * - HttpKernelInterface, - * - Response, - * - Application, - * - Command, - * - int|string|null as handled by GenericRuntime. - * - * @author Nicolas Grekas - */ -class SymfonyRuntime extends GenericRuntime -{ - private readonly ArgvInput $input; - private readonly ConsoleOutput $output; - private readonly Application $console; - private readonly Command $command; - - /** - * @param array { - * debug?: ?bool, - * env?: ?string, - * disable_dotenv?: ?bool, - * project_dir?: ?string, - * prod_envs?: ?string[], - * dotenv_path?: ?string, - * test_envs?: ?string[], - * use_putenv?: ?bool, - * runtimes?: ?array, - * error_handler?: string|false, - * env_var_name?: string, - * debug_var_name?: string, - * dotenv_overload?: ?bool, - * } $options - */ - public function __construct(array $options = []) - { - $envKey = $options['env_var_name'] ??= 'APP_ENV'; - $debugKey = $options['debug_var_name'] ??= 'APP_DEBUG'; - - if (isset($options['env'])) { - $_SERVER[$envKey] = $options['env']; - } elseif (empty($_GET) && isset($_SERVER['argv']) && class_exists(ArgvInput::class)) { - $this->options = $options; - $this->getInput(); - } - - if (!($options['disable_dotenv'] ?? false) && isset($options['project_dir']) && !class_exists(MissingDotenv::class, false)) { - (new Dotenv($envKey, $debugKey)) - ->setProdEnvs((array) ($options['prod_envs'] ?? ['prod'])) - ->usePutenv($options['use_putenv'] ?? false) - ->bootEnv($options['project_dir'].'/'.($options['dotenv_path'] ?? '.env'), 'dev', (array) ($options['test_envs'] ?? ['test']), $options['dotenv_overload'] ?? false); - - if (isset($this->input) && ($options['dotenv_overload'] ?? false)) { - if ($this->input->getParameterOption(['--env', '-e'], $_SERVER[$envKey], true) !== $_SERVER[$envKey]) { - throw new \LogicException(\sprintf('Cannot use "--env" or "-e" when the "%s" file defines "%s" and the "dotenv_overload" runtime option is true.', $options['dotenv_path'] ?? '.env', $envKey)); - } - - if ($_SERVER[$debugKey] && $this->input->hasParameterOption('--no-debug', true)) { - putenv($debugKey.'='.$_SERVER[$debugKey] = $_ENV[$debugKey] = '0'); - } - } - - $options['debug'] ??= '1' === $_SERVER[$debugKey]; - $options['disable_dotenv'] = true; - } else { - $_SERVER[$envKey] ??= $_ENV[$envKey] ?? 'dev'; - $_SERVER[$debugKey] ??= $_ENV[$debugKey] ?? !\in_array($_SERVER[$envKey], (array) ($options['prod_envs'] ?? ['prod']), true); - } - - $options['error_handler'] ??= SymfonyErrorHandler::class; - - parent::__construct($options); - } - - public function getRunner(?object $application): RunnerInterface - { - if ($application instanceof HttpKernelInterface) { - return new HttpKernelRunner($application, Request::createFromGlobals(), $this->options['debug'] ?? false); - } - - if ($application instanceof Response) { - return new ResponseRunner($application); - } - - if ($application instanceof Command) { - $console = $this->console ??= new Application(); - $console->setName($application->getName() ?: $console->getName()); - - if (!$application->getName() || !$console->has($application->getName())) { - $application->setName($_SERVER['argv'][0]); - if (method_exists($console, 'addCommand')) { - $console->addCommand($application); - } else { - $console->add($application); - } - } - - $console->setDefaultCommand($application->getName(), true); - $console->getDefinition()->addOptions($application->getDefinition()->getOptions()); - - return $this->getRunner($console); - } - - if ($application instanceof Application) { - if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.\PHP_SAPI.' SAPI'.\PHP_EOL; - } - - set_time_limit(0); - $defaultEnv = !isset($this->options['env']) ? ($_SERVER[$this->options['env_var_name']] ?? 'dev') : null; - $output = $this->output ??= new ConsoleOutput(); - - return new ConsoleApplicationRunner($application, $defaultEnv, $this->getInput(), $output); - } - - if (isset($this->command)) { - $this->getInput()->bind($this->command->getDefinition()); - } - - return parent::getRunner($application); - } - - protected function getArgument(\ReflectionParameter $parameter, ?string $type): mixed - { - return match ($type) { - Request::class => Request::createFromGlobals(), - InputInterface::class => $this->getInput(), - OutputInterface::class => $this->output ??= new ConsoleOutput(), - Application::class => $this->console ??= new Application(), - Command::class => $this->command ??= new Command(), - default => parent::getArgument($parameter, $type), - }; - } - - protected static function register(GenericRuntime $runtime): GenericRuntime - { - $self = new self($runtime->options + ['runtimes' => []]); - $self->options['runtimes'] += [ - HttpKernelInterface::class => $self, - Request::class => $self, - Response::class => $self, - Application::class => $self, - Command::class => $self, - InputInterface::class => $self, - OutputInterface::class => $self, - ]; - $runtime->options = $self->options; - - return $self; - } - - private function getInput(): ArgvInput - { - if (!empty($_GET) && filter_var(\ini_get('register_argc_argv'), \FILTER_VALIDATE_BOOL)) { - throw new \Exception('CLI applications cannot be run safely on non-CLI SAPIs with register_argc_argv=On.'); - } - - if (isset($this->input)) { - return $this->input; - } - - $input = new ArgvInput(); - - if (isset($this->options['env'])) { - return $this->input = $input; - } - - if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) { - putenv($this->options['env_var_name'].'='.$_SERVER[$this->options['env_var_name']] = $_ENV[$this->options['env_var_name']] = $env); - } - - if ($input->hasParameterOption('--no-debug', true)) { - putenv($this->options['debug_var_name'].'='.$_SERVER[$this->options['debug_var_name']] = $_ENV[$this->options['debug_var_name']] = '0'); - } - - return $this->input = $input; - } -} diff --git a/lib/symfony/runtime/composer.json b/lib/symfony/runtime/composer.json deleted file mode 100644 index 4241bae48..000000000 --- a/lib/symfony/runtime/composer.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "symfony/runtime", - "type": "composer-plugin", - "description": "Enables decoupling PHP applications from global state", - "keywords": ["runtime"], - "homepage": "https://symfony.com", - "license" : "MIT", - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "require": { - "php": ">=8.1", - "composer-plugin-api": "^1.0|^2.0" - }, - "require-dev": { - "composer/composer": "^1.0.2|^2.0", - "symfony/console": "^5.4.9|^6.0.9|^7.0", - "symfony/dotenv": "^5.4|^6.0|^7.0", - "symfony/http-foundation": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0" - }, - "conflict": { - "symfony/dotenv": "<5.4" - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Runtime\\": "", - "Symfony\\Runtime\\Symfony\\Component\\": "Internal/" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "minimum-stability": "dev", - "extra": { - "class": "Symfony\\Component\\Runtime\\Internal\\ComposerPlugin" - } -} diff --git a/lib/symfony/var-dumper/Cloner/Data.php b/lib/symfony/var-dumper/Cloner/Data.php index a342ecb46..e5d776f5a 100644 --- a/lib/symfony/var-dumper/Cloner/Data.php +++ b/lib/symfony/var-dumper/Cloner/Data.php @@ -298,7 +298,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Stringable if (!$item instanceof Stub) { $cursor->attr = []; $type = \gettype($item); - if ($item && 'array' === $type) { + if ('array' === $type && $item) { $item = $this->getStub($item); } } elseif (Stub::TYPE_REF === $item->type) { diff --git a/lib/symfony/var-dumper/Cloner/Internal/NoDefault.php b/lib/symfony/var-dumper/Cloner/Internal/NoDefault.php deleted file mode 100644 index ed9db9884..000000000 --- a/lib/symfony/var-dumper/Cloner/Internal/NoDefault.php +++ /dev/null @@ -1,25 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\VarDumper\Cloner\Internal; - -/** - * Flags a typed property that has no default value. - * - * This dummy object is used to distinguish a property with a default value of null - * from a property that is uninitialized by default. - * - * @internal - */ -enum NoDefault -{ - case NoDefault; -} diff --git a/lib/symfony/var-dumper/Cloner/Stub.php b/lib/symfony/var-dumper/Cloner/Stub.php index a377d2b92..406192128 100644 --- a/lib/symfony/var-dumper/Cloner/Stub.php +++ b/lib/symfony/var-dumper/Cloner/Stub.php @@ -11,8 +11,6 @@ namespace Symfony\Component\VarDumper\Cloner; -use Symfony\Component\VarDumper\Cloner\Internal\NoDefault; - /** * Represents the main properties of a PHP variable. * @@ -42,34 +40,37 @@ class Stub public $position = 0; public $attr = []; - private static array $defaultProperties = []; - /** * @internal */ - public function __sleep(): array + protected static array $propertyDefaults = []; + + public function __serialize(): array { - $properties = []; + static $noDefault = new \stdClass(); - if (!isset(self::$defaultProperties[$c = static::class])) { - $reflection = new \ReflectionClass($c); - self::$defaultProperties[$c] = []; - - foreach ($reflection->getProperties() as $p) { - if ($p->isStatic()) { - continue; + if (self::class === static::class) { + $data = []; + foreach ($this as $k => $v) { + $default = self::$propertyDefaults[$this::class][$k] ??= ($p = new \ReflectionProperty($this, $k))->hasDefaultValue() ? $p->getDefaultValue() : ($p->hasType() ? $noDefault : null); + if ($noDefault === $default || $default !== $v) { + $data[$k] = $v; } - - self::$defaultProperties[$c][$p->name] = $p->hasDefaultValue() ? $p->getDefaultValue() : ($p->hasType() ? NoDefault::NoDefault : null); } + + return $data; } - foreach (self::$defaultProperties[$c] as $k => $v) { - if (NoDefault::NoDefault === $v || $this->$k !== $v) { - $properties[] = $k; + return \Closure::bind(function () use ($noDefault) { + $data = []; + foreach ($this as $k => $v) { + $default = self::$propertyDefaults[$this::class][$k] ??= ($p = new \ReflectionProperty($this, $k))->hasDefaultValue() ? $p->getDefaultValue() : ($p->hasType() ? $noDefault : null); + if ($noDefault === $default || $default !== $v) { + $data[$k] = $v; + } } - } - return $properties; + return $data; + }, $this, $this::class)(); } } diff --git a/resources/symfony/.env b/resources/symfony/.env deleted file mode 100644 index 6eee6fbbc..000000000 --- a/resources/symfony/.env +++ /dev/null @@ -1,20 +0,0 @@ -# In all environments, the following files are loaded if they exist, -# the latter taking precedence over the former: -# -# * .env contains default values for the environment variables needed by the app -# * .env.local uncommitted file with local overrides -# * .env.$APP_ENV committed environment-specific defaults -# * .env.$APP_ENV.local uncommitted environment-specific overrides -# -# Real environment variables win over .env files. -# -# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES. -# https://symfony.com/doc/current/configuration/secrets.html -# -# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2). -# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration - -###> symfony/framework-bundle ### -APP_ENV=prod -#APP_SECRET=extracted from iTop general configuration in ./symfony/packages/itop_configuration_bridge.php -###< symfony/framework-bundle ### diff --git a/resources/symfony/config/bundles.php b/resources/symfony/config/bundles.php deleted file mode 100644 index e60880154..000000000 --- a/resources/symfony/config/bundles.php +++ /dev/null @@ -1,8 +0,0 @@ - ['all' => true], - Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], - Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], - Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true], -]; diff --git a/resources/symfony/config/packages/cache.yaml b/resources/symfony/config/packages/cache.yaml deleted file mode 100644 index 6899b7200..000000000 --- a/resources/symfony/config/packages/cache.yaml +++ /dev/null @@ -1,19 +0,0 @@ -framework: - cache: - # Unique name of your app: used to compute stable namespaces for cache keys. - #prefix_seed: your_vendor_name/app_name - - # The "app" cache stores to the filesystem by default. - # The data in this cache should persist between deploys. - # Other options include: - - # Redis - #app: cache.adapter.redis - #default_redis_provider: redis://localhost - - # APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues) - #app: cache.adapter.apcu - - # Namespaced pools use the above "app" backend by default - #pools: - #my.dedicated.cache: null diff --git a/resources/symfony/config/packages/debug.yaml b/resources/symfony/config/packages/debug.yaml deleted file mode 100644 index ad874afdd..000000000 --- a/resources/symfony/config/packages/debug.yaml +++ /dev/null @@ -1,5 +0,0 @@ -when@dev: - debug: - # Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser. - # See the "server:dump" command to start a new server. - dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%" diff --git a/resources/symfony/config/packages/framework.yaml b/resources/symfony/config/packages/framework.yaml deleted file mode 100644 index cf3c0d694..000000000 --- a/resources/symfony/config/packages/framework.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# see https://symfony.com/doc/current/reference/configuration/framework.html -framework: - #secret: '%env(APP_SECRET)%' will be set by itop general configuration bridge - #csrf_protection: true - annotations: false - http_method_override: false - handle_all_throwables: true - - # Enables session support. Note that the session will ONLY be started if you read or write from it. - # Remove or comment this section to explicitly disable session support. - session: - handler_id: null - cookie_secure: auto - cookie_samesite: lax - - #esi: true - #fragments: true - php_errors: - log: true - -when@test: - framework: - test: true - session: - storage_factory_id: session.storage.factory.mock_file diff --git a/resources/symfony/config/packages/itop_configuration_bridge.php b/resources/symfony/config/packages/itop_configuration_bridge.php deleted file mode 100644 index ce3534a50..000000000 --- a/resources/symfony/config/packages/itop_configuration_bridge.php +++ /dev/null @@ -1,32 +0,0 @@ -parameters()->set('kernel.secret', $oConfig->Get('application.secret')); - -}; diff --git a/resources/symfony/config/packages/routing.yaml b/resources/symfony/config/packages/routing.yaml deleted file mode 100644 index 4b766ce57..000000000 --- a/resources/symfony/config/packages/routing.yaml +++ /dev/null @@ -1,12 +0,0 @@ -framework: - router: - utf8: true - - # Configure how to generate URLs in non-HTTP contexts, such as CLI commands. - # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands - #default_uri: http://localhost - -when@prod: - framework: - router: - strict_requirements: null diff --git a/resources/symfony/config/packages/twig.yaml b/resources/symfony/config/packages/twig.yaml deleted file mode 100644 index f9f4cc539..000000000 --- a/resources/symfony/config/packages/twig.yaml +++ /dev/null @@ -1,6 +0,0 @@ -twig: - default_path: '%kernel.project_dir%/templates' - -when@test: - twig: - strict_variables: true diff --git a/resources/symfony/config/packages/web_profiler.yaml b/resources/symfony/config/packages/web_profiler.yaml deleted file mode 100644 index b94611102..000000000 --- a/resources/symfony/config/packages/web_profiler.yaml +++ /dev/null @@ -1,17 +0,0 @@ -when@dev: - web_profiler: - toolbar: true - intercept_redirects: false - - framework: - profiler: - only_exceptions: false - collect_serializer_data: true - -when@test: - web_profiler: - toolbar: false - intercept_redirects: false - - framework: - profiler: { collect: false } diff --git a/resources/symfony/config/preload.php b/resources/symfony/config/preload.php deleted file mode 100644 index 9ff0d3b16..000000000 --- a/resources/symfony/config/preload.php +++ /dev/null @@ -1,9 +0,0 @@ -getProjectDir() . '/resources/symfony/config'; - } - - public function getCacheDir(): string - { - $sEnv = Session::Get('itop_env', 'production'); - return $this->getProjectDir() . "/data/cache-$sEnv/symfony"; - } - - public function getLogDir(): string - { - return $this->getProjectDir() . '/log/symfony'; - } -}