From 1a22c919a6c49b4cf14171a8df097a75c41a1cae Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 27 Apr 2021 08:03:12 +0200 Subject: [PATCH] chore: Merge composer.json files. --- src/Bundle/ChillActivityBundle/composer.json | 16 +++--- src/Bundle/ChillBudgetBundle/composer.json | 18 +++---- .../ChillCustomFieldsBundle/composer.json | 18 +++---- src/Bundle/ChillDocStoreBundle/composer.json | 6 +-- src/Bundle/ChillEventBundle/composer.json | 18 +++---- .../ChillFamilyMembersBundle/composer.json | 18 +++---- src/Bundle/ChillMainBundle/composer.json | 16 +++--- .../App/web/bundles/chillmain/composer.json | 51 +++++++++---------- src/Bundle/ChillPersonBundle/composer.json | 22 ++++---- src/Bundle/ChillReportBundle/composer.json | 18 +++---- src/Bundle/ChillTaskBundle/composer.json | 15 ++---- .../ChillThirdPartyBundle/composer.json | 20 +++----- 12 files changed, 104 insertions(+), 132 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/composer.json b/src/Bundle/ChillActivityBundle/composer.json index b860bc03b..26b73f7ef 100644 --- a/src/Bundle/ChillActivityBundle/composer.json +++ b/src/Bundle/ChillActivityBundle/composer.json @@ -3,13 +3,17 @@ "description": "This bundle extend chill for recording the different activities of the user", "type": "symfony-bundle", "license": "AGPL-3.0", - "keywords" : ["chill", "social work"], - "homepage" : "https://github.com/Chill-project/Activity", + "keywords": ["chill", "social work"], + "homepage": "https://github.com/Chill-project/Activity", "autoload": { - "psr-4": { "Chill\\ActivityBundle\\": "" } + "psr-4": { + "Chill\\ActivityBundle\\": "" + } }, "autoload-dev": { - "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + "classmap": [ + "Resources/test/Fixtures/App/app/AppKernel.php" + ] }, "authors": [ { @@ -17,10 +21,6 @@ "email": "info@champs-libres.coop" } ], - "require": { - }, - "require-dev": { - }, "scripts": { "post-install-cmd": [ "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations", diff --git a/src/Bundle/ChillBudgetBundle/composer.json b/src/Bundle/ChillBudgetBundle/composer.json index dadcb77b6..e2c0c5e96 100644 --- a/src/Bundle/ChillBudgetBundle/composer.json +++ b/src/Bundle/ChillBudgetBundle/composer.json @@ -3,13 +3,12 @@ "description": "This bundle extend chill for recording element of a budget for peoples", "type": "symfony-bundle", "license": "AGPL-3.0", - "keywords" : ["chill", "social work"], - "homepage" : "https://framagit.org/Chill-project/BudgetBundle", + "keywords": ["chill", "social work"], + "homepage": "https://framagit.org/Chill-project/BudgetBundle", "autoload": { - "psr-4": { "Chill\\AMLI\\BudgetBundle\\": "" } - }, - "autoload-dev": { - "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + "psr-4": { + "Chill\\AMLI\\BudgetBundle\\": "" + } }, "authors": [ { @@ -17,13 +16,8 @@ "email": "info@champs-libres.coop" } ], - "require": { - }, - "require-dev": { - }, "extra": { - "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations", - "symfony-app-dir": "Test/Fixtures/App/app/" + "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations" }, "minimum-stability": "dev", "prefer-stable": true diff --git a/src/Bundle/ChillCustomFieldsBundle/composer.json b/src/Bundle/ChillCustomFieldsBundle/composer.json index 5f94dc59e..1c0f60954 100644 --- a/src/Bundle/ChillCustomFieldsBundle/composer.json +++ b/src/Bundle/ChillCustomFieldsBundle/composer.json @@ -3,25 +3,25 @@ "license": "AGPL-3.0", "type": "symfony-bundle", "description": "This bundle allow to add custom fields on entities.", - "keywords" : ["chill", "social work"], - "homepage" : "https://github.com/Chill-project/CustomFields", + "keywords": ["chill", "social work"], + "homepage": "https://github.com/Chill-project/CustomFields", "autoload": { - "psr-4": { "Chill\\CustomFieldsBundle\\": "" } + "psr-4": { + "Chill\\CustomFieldsBundle\\": "" + } }, "autoload-dev": { - "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + "classmap": [ + "Resources/test/Fixtures/App/app/AppKernel.php" + ] }, - "authors" : [ + "authors": [ { "name": "Champs-Libres", "email": "info@champs-libres.coop", "homepage": "http://www.champs-libres.coop" } ], - "require": { - }, - "require-dev": { - }, "minimum-stability": "dev", "prefer-stable": true, "scripts": { diff --git a/src/Bundle/ChillDocStoreBundle/composer.json b/src/Bundle/ChillDocStoreBundle/composer.json index 384f6c093..81dff35c9 100644 --- a/src/Bundle/ChillDocStoreBundle/composer.json +++ b/src/Bundle/ChillDocStoreBundle/composer.json @@ -3,9 +3,9 @@ "description": "A Chill bundle to store documents", "type": "symfony-bundle", "autoload": { - "psr-4": { "Chill\\DocStoreBundle\\" : "" } - }, - "require": { + "psr-4": { + "Chill\\DocStoreBundle\\": "" + } }, "license": "AGPL-3.0" } diff --git a/src/Bundle/ChillEventBundle/composer.json b/src/Bundle/ChillEventBundle/composer.json index 0a10b88f5..3662a9e74 100644 --- a/src/Bundle/ChillEventBundle/composer.json +++ b/src/Bundle/ChillEventBundle/composer.json @@ -3,16 +3,18 @@ "description": "This bundle extend chill software. This bundle allow to define event and participation to those events.", "type": "symfony-bundle", "license": "AGPL-3.0-only", - "keywords" : ["chill", "social work"], - "homepage" : "https://git.framasoft.org/Chill-project/Chill-Group", + "keywords": ["chill", "social work"], + "homepage": "https://git.framasoft.org/Chill-project/Chill-Group", "autoload": { - "psr-4": { "Chill\\EventBundle\\": "" } + "psr-4": { + "Chill\\EventBundle\\": "" + } }, "support": { "issues": "https://git.framasoft.org/Chill-project/Chill-Event/issues", "source": "https://git.framasoft.org/Chill-project/Chill-Event", - "docs" : "http://docs.chill.social", - "email": "dev@listes.chill.social" + "docs": "http://docs.chill.social", + "email": "dev@listes.chill.social" }, "authors": [ { @@ -20,11 +22,7 @@ "email": "info@champs-libres.coop" } ], - "require": { - }, - "require-dev": { - }, - "suggest" : { + "suggest": { "chill-project/group": "dev-master@dev" }, "scripts": { diff --git a/src/Bundle/ChillFamilyMembersBundle/composer.json b/src/Bundle/ChillFamilyMembersBundle/composer.json index 7c6607b55..21efb0cf2 100644 --- a/src/Bundle/ChillFamilyMembersBundle/composer.json +++ b/src/Bundle/ChillFamilyMembersBundle/composer.json @@ -3,13 +3,12 @@ "description": "This bundle extend chill for recording family members into a file", "type": "symfony-bundle", "license": "AGPL-3.0-or-later", - "keywords" : ["chill", "social work"], - "homepage" : "https://framagit.org/Chill-project/Chill-FamilyMembers", + "keywords": ["chill", "social work"], + "homepage": "https://framagit.org/Chill-project/Chill-FamilyMembers", "autoload": { - "psr-4": { "Chill\\AMLI\\FamilyMembersBundle\\": "" } - }, - "autoload-dev": { - "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + "psr-4": { + "Chill\\AMLI\\FamilyMembersBundle\\": "" + } }, "authors": [ { @@ -17,13 +16,8 @@ "email": "info@champs-libres.coop" } ], - "require": { - }, - "require-dev": { - }, "extra": { - "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations", - "symfony-app-dir": "Test/Fixtures/App/app/" + "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations" }, "minimum-stability": "dev", "prefer-stable": true diff --git a/src/Bundle/ChillMainBundle/composer.json b/src/Bundle/ChillMainBundle/composer.json index 0c95c432a..8f0c43c26 100644 --- a/src/Bundle/ChillMainBundle/composer.json +++ b/src/Bundle/ChillMainBundle/composer.json @@ -3,8 +3,8 @@ "license": "AGPL-3.0", "type": "symfony-bundle", "description": "The main bundle for the Chill App", - "keywords" : ["chill", "social work", "software for social service"], - "homepage" : "http://chill.social", + "keywords": ["chill", "social work", "software for social service"], + "homepage": "http://chill.social", "support": { "email": "dev@lists.chill.social", "issues": "https://git.framasoft.org/Chill-project/Chill-Main/issues", @@ -12,12 +12,16 @@ "docs": "http://docs.chill.social" }, "autoload": { - "psr-4": { "Chill\\MainBundle\\": "" } + "psr-4": { + "Chill\\MainBundle\\": "" + } }, "autoload-dev": { - "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + "classmap": [ + "Resources/test/Fixtures/App/app/AppKernel.php" + ] }, - "authors" : [ + "authors": [ { "name": "Champs-Libres", "email": "info@champs-libres.coop", @@ -28,8 +32,6 @@ "league/csv": "^9.6", "phpoffice/phpspreadsheet": "~1.2" }, - "require-dev": { - }, "scripts": { "post-install-cmd": [ "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations", diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/composer.json b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/composer.json index cd2d26a2a..7a7db04be 100644 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/composer.json +++ b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/composer.json @@ -1,29 +1,28 @@ { - "name": - "ivaynberg/select2", - "description": "Select2 is a jQuery based replacement for select boxes.", - "version": "3.5.2", - "type": "component", - "homepage": "http://ivaynberg.github.io/select2/", - "license": "Apache-2.0", - "require": { - "robloach/component-installer": "*", - "components/jquery": ">=1.7.1" - }, - "extra": { - "component": { - "scripts": [ - "select2.js" - ], - "files": [ - "select2.js", - "select2_locale_*.js", - "select2.css", - "select2-bootstrap.css", - "select2-spinner.gif", - "select2.png", - "select2x2.png" - ] + "name": "ivaynberg/select2", + "description": "Select2 is a jQuery based replacement for select boxes.", + "version": "3.5.2", + "type": "component", + "homepage": "http://ivaynberg.github.io/select2/", + "license": "Apache-2.0", + "require": { + "robloach/component-installer": "*", + "components/jquery": ">=1.7.1" + }, + "extra": { + "component": { + "scripts": [ + "select2.js" + ], + "files": [ + "select2.js", + "select2_locale_*.js", + "select2.css", + "select2-bootstrap.css", + "select2-spinner.gif", + "select2.png", + "select2x2.png" + ] + } } - } } diff --git a/src/Bundle/ChillPersonBundle/composer.json b/src/Bundle/ChillPersonBundle/composer.json index b6e7804aa..b3e6ad710 100644 --- a/src/Bundle/ChillPersonBundle/composer.json +++ b/src/Bundle/ChillPersonBundle/composer.json @@ -1,29 +1,27 @@ -{ +{ "name": "chill-project/person", "license": "AGPL-3.0", "type": "symfony-bundle", "description": "A bundle to deal with persons", - "keywords" : ["chill", "social work", "persons"], - "homepage" : "https://github.com/Chill-project/Person", + "keywords": ["chill", "social work", "persons"], + "homepage": "https://github.com/Chill-project/Person", "autoload": { - "psr-4": { "Chill\\PersonBundle\\": "" } + "psr-4": { + "Chill\\PersonBundle\\": "" + } }, "autoload-dev": { - "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + "classmap": [ + "Resources/test/Fixtures/App/app/AppKernel.php" + ] }, - "authors" : [ + "authors": [ { "name": "Champs-Libres", "email": "info@champs-libres.coop", "homepage": "http://www.champs-libres.coop" } ], - "require": { - - }, - "require-dev": { - - }, "scripts": { "post-install-cmd": [ "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations", diff --git a/src/Bundle/ChillReportBundle/composer.json b/src/Bundle/ChillReportBundle/composer.json index a5c17a2ee..6d71b447c 100644 --- a/src/Bundle/ChillReportBundle/composer.json +++ b/src/Bundle/ChillReportBundle/composer.json @@ -2,26 +2,26 @@ "name": "chill-project/report", "description": "The bundle for reports", "type": "symfony-bundle", - "keywords" : ["chill", "social work"], + "keywords": ["chill", "social work"], "license": "AGPL-3.0", - "homepage" : "https://github.com/Chill-project/Report", + "homepage": "https://github.com/Chill-project/Report", "autoload": { - "psr-4": { "Chill\\ReportBundle\\": "" } + "psr-4": { + "Chill\\ReportBundle\\": "" + } }, "autoload-dev": { - "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + "classmap": [ + "Resources/test/Fixtures/App/app/AppKernel.php" + ] }, - "authors" : [ + "authors": [ { "name": "Champs-Libres", "email": "info@champs-libres.coop", "homepage": "http://www.champs-libres.coop" } ], - "require": { - }, - "require-dev": { - }, "scripts": { "post-install-cmd": [ "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations", diff --git a/src/Bundle/ChillTaskBundle/composer.json b/src/Bundle/ChillTaskBundle/composer.json index ecd4a91e9..df6d680d0 100644 --- a/src/Bundle/ChillTaskBundle/composer.json +++ b/src/Bundle/ChillTaskBundle/composer.json @@ -5,15 +5,9 @@ "keywords": ["chill", "social work", "tasks"], "homepage": "https://framagit.org/Chill-project/Chill-Task", "autoload": { - "psr-4": { "Chill\\TaskBundle\\" : "" } - }, - "autoload-dev": { - "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] - }, - "require": { - - }, - "require-dev": { + "psr-4": { + "Chill\\TaskBundle\\": "" + } }, "license": "AGPL-3.0-or-later", "authors": [ @@ -33,7 +27,6 @@ ] }, "extra": { - "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations", - "symfony-app-dir": "Resources/test/Fixtures/App/" + "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations" } } diff --git a/src/Bundle/ChillThirdPartyBundle/composer.json b/src/Bundle/ChillThirdPartyBundle/composer.json index d54112504..75b167be4 100644 --- a/src/Bundle/ChillThirdPartyBundle/composer.json +++ b/src/Bundle/ChillThirdPartyBundle/composer.json @@ -3,25 +3,20 @@ "license": "AGPL-3.0", "type": "symfony-bundle", "description": "A bundle to manage Third Party contact categories", - "keywords" : ["chill", "social work", "contacts"], - "homepage" : "https://framagit.org/Chill-project/Chill-ThirdParty", + "keywords": ["chill", "social work", "contacts"], + "homepage": "https://framagit.org/Chill-project/Chill-ThirdParty", "autoload": { - "psr-4": { "Chill\\ThirdPartyBundle\\": "" } + "psr-4": { + "Chill\\ThirdPartyBundle\\": "" + } }, - "autoload-dev": { - "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] - }, - "authors" : [ + "authors": [ { "name": "Champs-Libres", "email": "info@champs-libres.coop", "homepage": "http://www.champs-libres.coop" } ], - "require": { - }, - "require-dev": { - }, "scripts": { "post-install-cmd": [ "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations", @@ -33,7 +28,6 @@ ] }, "extra": { - "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations", - "symfony-app-dir": "Tests/Fixtures/App/" + "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations" } }