From cdadca14cd0d0cccaf30c3177fa3a4ec508196dd Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 9 Aug 2021 11:53:50 +0200 Subject: [PATCH] Fix version number in composer.lock and remove development dependencies (#50) --- composer.json | 1 - libraries/vendor/composer/autoload_classmap.php | 8 -------- libraries/vendor/composer/autoload_static.php | 8 -------- libraries/vendor/composer/installed.php | 12 ++++++------ 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index cb3180bb8ad8b..702e137d0ddf9 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,6 @@ "keywords": ["joomla", "cms"], "homepage": "https://github.com/joomla/joomla-cms", "license": "GPL-2.0-or-later", - "non-feature-branches": ["staging"], "config": { "optimize-autoloader": true, "platform": { diff --git a/libraries/vendor/composer/autoload_classmap.php b/libraries/vendor/composer/autoload_classmap.php index fe06cc9d2942a..ab44497339f91 100644 --- a/libraries/vendor/composer/autoload_classmap.php +++ b/libraries/vendor/composer/autoload_classmap.php @@ -42,11 +42,6 @@ 'Joomla\\Data\\DataObject' => $vendorDir . '/joomla/data/src/DataObject.php', 'Joomla\\Data\\DataSet' => $vendorDir . '/joomla/data/src/DataSet.php', 'Joomla\\Data\\DumpableInterface' => $vendorDir . '/joomla/data/src/DumpableInterface.php', - 'Joomla\\Data\\Tests\\DataObjectTest' => $vendorDir . '/joomla/data/Tests/DataObjectTest.php', - 'Joomla\\Data\\Tests\\DataSetTest' => $vendorDir . '/joomla/data/Tests/DataSetTest.php', - 'Joomla\\Data\\Tests\\Stubs\\Buran' => $vendorDir . '/joomla/data/Tests/Stubs/Buran.php', - 'Joomla\\Data\\Tests\\Stubs\\Capitaliser' => $vendorDir . '/joomla/data/Tests/Stubs/Capitaliser.php', - 'Joomla\\Data\\Tests\\Stubs\\Vostok' => $vendorDir . '/joomla/data/Tests/Stubs/Vostok.php', 'Joomla\\Event\\AbstractEvent' => $vendorDir . '/joomla/event/src/AbstractEvent.php', 'Joomla\\Event\\DelegatingDispatcher' => $vendorDir . '/joomla/event/src/DelegatingDispatcher.php', 'Joomla\\Event\\Dispatcher' => $vendorDir . '/joomla/event/src/Dispatcher.php', @@ -136,9 +131,6 @@ 'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php', - 'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php', - 'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', - 'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php', 'ReCaptcha\\ReCaptcha' => $vendorDir . '/google/recaptcha/src/ReCaptcha/ReCaptcha.php', 'ReCaptcha\\RequestMethod' => $vendorDir . '/google/recaptcha/src/ReCaptcha/RequestMethod.php', 'ReCaptcha\\RequestMethod\\Curl' => $vendorDir . '/google/recaptcha/src/ReCaptcha/RequestMethod/Curl.php', diff --git a/libraries/vendor/composer/autoload_static.php b/libraries/vendor/composer/autoload_static.php index 6c01db0cc0790..c3d477b1df289 100644 --- a/libraries/vendor/composer/autoload_static.php +++ b/libraries/vendor/composer/autoload_static.php @@ -245,11 +245,6 @@ class ComposerStaticInitc14bde14f8c86840049f5c1809c453dd 'Joomla\\Data\\DataObject' => __DIR__ . '/..' . '/joomla/data/src/DataObject.php', 'Joomla\\Data\\DataSet' => __DIR__ . '/..' . '/joomla/data/src/DataSet.php', 'Joomla\\Data\\DumpableInterface' => __DIR__ . '/..' . '/joomla/data/src/DumpableInterface.php', - 'Joomla\\Data\\Tests\\DataObjectTest' => __DIR__ . '/..' . '/joomla/data/Tests/DataObjectTest.php', - 'Joomla\\Data\\Tests\\DataSetTest' => __DIR__ . '/..' . '/joomla/data/Tests/DataSetTest.php', - 'Joomla\\Data\\Tests\\Stubs\\Buran' => __DIR__ . '/..' . '/joomla/data/Tests/Stubs/Buran.php', - 'Joomla\\Data\\Tests\\Stubs\\Capitaliser' => __DIR__ . '/..' . '/joomla/data/Tests/Stubs/Capitaliser.php', - 'Joomla\\Data\\Tests\\Stubs\\Vostok' => __DIR__ . '/..' . '/joomla/data/Tests/Stubs/Vostok.php', 'Joomla\\Event\\AbstractEvent' => __DIR__ . '/..' . '/joomla/event/src/AbstractEvent.php', 'Joomla\\Event\\DelegatingDispatcher' => __DIR__ . '/..' . '/joomla/event/src/DelegatingDispatcher.php', 'Joomla\\Event\\Dispatcher' => __DIR__ . '/..' . '/joomla/event/src/Dispatcher.php', @@ -339,9 +334,6 @@ class ComposerStaticInitc14bde14f8c86840049f5c1809c453dd 'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php', - 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php', - 'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', - 'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php', 'ReCaptcha\\ReCaptcha' => __DIR__ . '/..' . '/google/recaptcha/src/ReCaptcha/ReCaptcha.php', 'ReCaptcha\\RequestMethod' => __DIR__ . '/..' . '/google/recaptcha/src/ReCaptcha/RequestMethod.php', 'ReCaptcha\\RequestMethod\\Curl' => __DIR__ . '/..' . '/google/recaptcha/src/ReCaptcha/RequestMethod/Curl.php', diff --git a/libraries/vendor/composer/installed.php b/libraries/vendor/composer/installed.php index f21b64339558f..79cb33aa338ef 100644 --- a/libraries/vendor/composer/installed.php +++ b/libraries/vendor/composer/installed.php @@ -1,11 +1,11 @@ array( - 'pretty_version' => 'dev-staging', - 'version' => 'dev-staging', + 'pretty_version' => 'dev-3.10-dev', + 'version' => 'dev-3.10-dev', 'type' => 'project', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), - 'reference' => '920cf31b6b90656dd9156325f862a6a00e71e60f', + 'reference' => 'c764d4dcb74353037015f166f16ce345555ab381', 'name' => 'joomla/joomla-cms', 'dev' => false, ), @@ -128,12 +128,12 @@ 'dev_requirement' => false, ), 'joomla/joomla-cms' => array( - 'pretty_version' => 'dev-staging', - 'version' => 'dev-staging', + 'pretty_version' => 'dev-3.10-dev', + 'version' => 'dev-3.10-dev', 'type' => 'project', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), - 'reference' => '920cf31b6b90656dd9156325f862a6a00e71e60f', + 'reference' => 'c764d4dcb74353037015f166f16ce345555ab381', 'dev_requirement' => false, ), 'joomla/ldap' => array(