composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-01 06:28:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	lib/composer/installed.php
#	setup/licenses/community-licenses.xml
#	setup/setuputils.class.inc.php
#	sources/application/TwigBase/Controller/Controller.php
This commit is contained in:
Pierre Goiffon
2022-02-14 08:41:33 +01:00
parent a65c55fc48 4a67819f87
commit 6a5840ed82
416 changed files with 6638 additions and 2444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
lib/composer/installed.php
View File

@@ -5,7 +5,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'reference' => '47feb7f4259aebc4e9b27cfc8a6eafbbbf0b3686',
'reference' => '9ad341f73a2aa0bd50515d88e1daac99b124238f',
'name' => '__root__',
'dev' => true,
),
@@ -16,7 +16,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'reference' => '47feb7f4259aebc4e9b27cfc8a6eafbbbf0b3686',
'reference' => '9ad341f73a2aa0bd50515d88e1daac99b124238f',
'dev_requirement' => false,
),
'combodo/tcpdf' => array(
@@ -176,210 +176,210 @@
'dev_requirement' => false,
),
'symfony/cache' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/cache',
'aliases' => array(),
'reference' => '3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3',
'reference' => 'a7a14c4832760bd1fbd31be2859ffedc9b6ff813',
'dev_requirement' => false,
),
'symfony/class-loader' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/class-loader',
'aliases' => array(),
'reference' => 'e212b06996819a2bce026a63da03b7182d05a690',
'reference' => 'a22265a9f3511c0212bf79f54910ca5a77c0e92c',
'dev_requirement' => false,
),
'symfony/config' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/config',
'aliases' => array(),
'reference' => 'a599a867d0e4a07c342b5f1e656b3915a540ddbe',
'reference' => 'bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f',
'dev_requirement' => false,
),
'symfony/console' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/console',
'aliases' => array(),
'reference' => '1ee23b3b659b06c622f2bd2492a229e416eb4586',
'reference' => 'a10b1da6fc93080c180bba7219b5ff5b7518fe81',
'dev_requirement' => false,
),
'symfony/css-selector' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/css-selector',
'aliases' => array(),
'reference' => 'f819f71ae3ba6f396b4c015bd5895de7d2f1f85f',
'reference' => 'da3d9da2ce0026771f5fe64cb332158f1bd2bc33',
'dev_requirement' => false,
),
'symfony/debug' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/debug',
'aliases' => array(),
'reference' => 'f72e33fdb1170b326e72c3157f0cd456351dd086',
'reference' => 'ab42889de57fdfcfcc0759ab102e2fd4ea72dcae',
'dev_requirement' => false,
),
'symfony/dependency-injection' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/dependency-injection',
'aliases' => array(),
'reference' => '0d201916bfb3af939fec3c0c8815ea16c60ac1a2',
'reference' => '51d2a2708c6ceadad84393f8581df1dcf9e5e84b',
'dev_requirement' => false,
),
'symfony/dotenv' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/dotenv',
'aliases' => array(),
'reference' => 'c7e8e471fea74e868ae797970b383dea89ae548a',
'reference' => '1022723ac4f56b001d99691d96c6025dbf1404f1',
'dev_requirement' => false,
),
'symfony/event-dispatcher' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/event-dispatcher',
'aliases' => array(),
'reference' => 'f9031c22ec127d4a2450760f81a8677fe8a10177',
'reference' => '31fde73757b6bad247c54597beef974919ec6860',
'dev_requirement' => false,
),
'symfony/filesystem' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/filesystem',
'aliases' => array(),
'reference' => '00cdad0936d06fab136944bc2342b762b1c3a4a2',
'reference' => 'e58d7841cddfed6e846829040dca2cca0ebbbbb3',
'dev_requirement' => false,
),
'symfony/finder' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/finder',
'aliases' => array(),
'reference' => '290ae21279b37bfd287cdcce640d51204e84afdf',
'reference' => 'b6b6ad3db3edb1b4b1c1896b1975fb684994de6e',
'dev_requirement' => false,
),
'symfony/framework-bundle' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'symfony-bundle',
'install_path' => __DIR__ . '/../symfony/framework-bundle',
'aliases' => array(),
'reference' => '0d61117c7a770da0bd8bbe7ccfa34d8063f272ea',
'reference' => '6c95e747b75ddd2af61152ce93bf87299d15710e',
'dev_requirement' => false,
),
'symfony/http-foundation' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/http-foundation',
'aliases' => array(),
'reference' => 'd2d0cfe8e319d9df44c4cca570710fcf221d4593',
'reference' => 'b9885fcce6fe494201da4f70a9309770e9d13dc8',
'dev_requirement' => false,
),
'symfony/http-kernel' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.49',
'version' => '3.4.49.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/http-kernel',
'aliases' => array(),
'reference' => 'c42c8339acb28cfff0fb1786948db4d23d609ff7',
'reference' => '5aa72405f5bd5583c36ed6e756acb17d3f98ac40',
'dev_requirement' => false,
),
'symfony/polyfill-apcu' => array(
'pretty_version' => 'v1.13.1',
'version' => '1.13.1.0',
'pretty_version' => 'v1.19.0',
'version' => '1.19.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-apcu',
'aliases' => array(),
'reference' => 'a8e961c841b9ec52927a87914f8820a1ad8f8116',
'reference' => 'b44b51e7814c23bfbd793a16ead5d7ce43ed23c5',
'dev_requirement' => false,
),
'symfony/polyfill-ctype' => array(
'pretty_version' => 'v1.13.1',
'version' => '1.13.1.0',
'pretty_version' => 'v1.19.0',
'version' => '1.19.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
'aliases' => array(),
'reference' => 'f8f0b461be3385e56d6de3dbb5a0df24c0c275e3',
'reference' => 'aed596913b70fae57be53d86faa2e9ef85a2297b',
'dev_requirement' => false,
),
'symfony/polyfill-mbstring' => array(
'pretty_version' => 'v1.13.1',
'version' => '1.13.1.0',
'pretty_version' => 'v1.19.0',
'version' => '1.19.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
'aliases' => array(),
'reference' => '7b4aab9743c30be783b73de055d24a39cf4b954f',
'reference' => 'b5f7b932ee6fa802fc792eabd77c4c88084517ce',
'dev_requirement' => false,
),
'symfony/polyfill-php56' => array(
'pretty_version' => 'v1.13.1',
'version' => '1.13.1.0',
'pretty_version' => 'v1.19.0',
'version' => '1.19.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-php56',
'aliases' => array(),
'reference' => '53dd1cdf3cb986893ccf2b96665b25b3abb384f4',
'reference' => 'ea19621731cbd973a6702cfedef3419768bf3372',
'dev_requirement' => false,
),
'symfony/polyfill-php70' => array(
'pretty_version' => 'v1.13.1',
'version' => '1.13.1.0',
'pretty_version' => 'v1.19.0',
'version' => '1.19.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-php70',
'aliases' => array(),
'reference' => 'af23c7bb26a73b850840823662dda371484926c4',
'reference' => '3fe414077251a81a1b15b1c709faf5c2fbae3d4e',
'dev_requirement' => false,
),
'symfony/polyfill-util' => array(
'pretty_version' => 'v1.13.1',
'version' => '1.13.1.0',
'pretty_version' => 'v1.19.0',
'version' => '1.19.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-util',
'aliases' => array(),
'reference' => '964a67f293b66b95883a5ed918a65354fcd2258f',
'reference' => '8df0c3e6a4b85df9a5c6f3f2f46fba5c5c47058a',
'dev_requirement' => false,
),
'symfony/routing' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/routing',
'aliases' => array(),
'reference' => 'b689ccd48e234ea404806d94b07eeb45f9f6f06a',
'reference' => '3e522ac69cadffd8131cc2b22157fa7662331a6c',
'dev_requirement' => false,
),
'symfony/stopwatch' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/stopwatch',
'aliases' => array(),
'reference' => 'efe0af281ad336bc3b10375c88b117499f1d8494',
'reference' => '298b81faad4ce60e94466226b2abbb8c9bca7462',
'dev_requirement' => true,
),
'symfony/twig-bridge' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'symfony-bridge',
'install_path' => __DIR__ . '/../symfony/twig-bridge',
'aliases' => array(),
'reference' => '49b824ddc7f2d250a1f172349cd9a111d63287c0',
'reference' => '090d19d6f1ea5b9e1d79f372785aa5e5c9cd4042',
'dev_requirement' => false,
),
'symfony/twig-bundle' => array(
@@ -392,30 +392,30 @@
'dev_requirement' => false,
),
'symfony/var-dumper' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/var-dumper',
'aliases' => array(),
'reference' => '569e261461600810845a8305ca3f64abd3e712c0',
'reference' => '0719f6cf4633a38b2c1585140998579ce23b4b7d',
'dev_requirement' => true,
),
'symfony/web-profiler-bundle' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'symfony-bundle',
'install_path' => __DIR__ . '/../symfony/web-profiler-bundle',
'aliases' => array(),
'reference' => '3ae27cf1b2776cd68aa15fdb57089970f78bcf11',
'reference' => 'ccb83b3a508f4a683e44f571f127beebdc315ff9',
'dev_requirement' => true,
),
'symfony/yaml' => array(
'pretty_version' => 'v3.4.36',
'version' => '3.4.36.0',
'pretty_version' => 'v3.4.47',
'version' => '3.4.47.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/yaml',
'aliases' => array(),
'reference' => 'dab657db15207879217fc81df4f875947bf68804',
'reference' => '88289caa3c166321883f67fe5130188ebbb47094',
'dev_requirement' => false,
),
'tecnickcom/tcpdf' => array(