merge

bard.json

@@ -3,10 +3,7 @@
     "packages": [
         {
             "path": "src/SonsOfPHP/Bard",
-            "repository": "[email protected]:SonsOfPHP/bard.git",
-            "config": {
-                "merge": false
-            }
+            "repository": "[email protected]:SonsOfPHP/bard.git"
         },
         {
             "path": "src/SonsOfPHP/Component/Assert",

composer.json

@@ -12,6 +12,10 @@
     "homepage": "https://github.com/SonsOfPHP",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"
@@ -79,11 +83,8 @@
         "psr/log": "^2.0 || ^3.0",
         "psr/simple-cache": "^2.0 || ^3.0",
         "symfony/console": "^4 || ^5 || ^6 || ^7",
-        "symfony/dependency-injection": "^5 || ^6 || ^7",
         "symfony/dotenv": "^5 || ^6 || ^7",
         "symfony/finder": "^5 || ^6 || ^7",
-        "symfony/http-kernel": "^5 || ^6 || ^7",
-        "symfony/messenger": "^5 || ^6 || ^7",
         "symfony/options-resolver": "^6 || ^7",
         "symfony/process": "^5 || ^6 || ^7",
         "symfony/security-bundle": "^6 || ^7",
@@ -100,7 +101,6 @@
         "sonsofphp/cookie": "self.version",
         "sonsofphp/cookie-contract": "self.version",
         "sonsofphp/cqrs": "self.version",
-        "sonsofphp/cqrs-bundle": "self.version",
         "sonsofphp/cqrs-contract": "self.version",
         "sonsofphp/cqrs-symfony": "self.version",
         "sonsofphp/event-dispatcher": "self.version",
@@ -150,7 +150,6 @@
             "src/SonsOfPHP/Component/Container/Tests",
             "src/SonsOfPHP/Component/Cookie/Tests",
             "src/SonsOfPHP/Component/Cqrs/Tests",
-            "src/SonsOfPHP/Bundle/Cqrs/Tests",
             "src/SonsOfPHP/Bridge/Symfony/Cqrs/Tests",
             "src/SonsOfPHP/Bridge/Symfony/EventSourcing/Tests",
             "src/SonsOfPHP/Bridge/Twig/Money/Tests",
@@ -186,7 +185,6 @@
             "SonsOfPHP\\Bridge\\Symfony\\Cqrs\\": "src/SonsOfPHP/Bridge/Symfony/Cqrs",
             "SonsOfPHP\\Bridge\\Symfony\\EventSourcing\\": "src/SonsOfPHP/Bridge/Symfony/EventSourcing",
             "SonsOfPHP\\Bridge\\Twig\\Money\\": "src/SonsOfPHP/Bridge/Twig/Money",
-            "SonsOfPHP\\Bundle\\Cqrs\\": "src/SonsOfPHP/Bundle/Cqrs",
             "SonsOfPHP\\Component\\Assert\\": "src/SonsOfPHP/Component/Assert",
             "SonsOfPHP\\Component\\Cache\\": "src/SonsOfPHP/Component/Cache",
             "SonsOfPHP\\Component\\Clock\\": "src/SonsOfPHP/Component/Clock",
@@ -234,13 +232,13 @@
     "require-dev": {
         "phpunit/phpunit": "^10.4",
         "symfony/http-foundation": "^5 || ^6 || ^7",
+        "symfony/messenger": "^5 || ^6 || ^7",
         "symfony/serializer": "^5 || ^6 || ^7"
     },
     "autoload-dev": {
         "psr-4": {
             "SonsOfPHP\\Bard\\Tests\\": "src/SonsOfPHP/Bard/Tests",
-            "SonsOfPHP\\Bridge\\Symfony\\Cqrs\\Tests\\": "src/SonsOfPHP/Bridge/Symfony/Cqrs/Tests",
-            "SonsOfPHP\\Bundle\\Cqrs\\Tests\\": "src/SonsOfPHP/Bundle/Cqrs/Tests"
+            "SonsOfPHP\\Bridge\\Symfony\\Cqrs\\Tests\\": "src/SonsOfPHP/Bridge/Symfony/Cqrs/Tests"
         }
     },
     "scripts": {

src/SonsOfPHP/Bard/composer.json

@@ -52,6 +52,10 @@
         "docs": "https://docs.sonsofphp.com"
     },
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Bard/src/Console/Command/MergeCommand.php

@@ -70,6 +70,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         ;
 
         foreach ($this->bardConfig->getSection('packages') as $pkg) {
+            if (array_key_exists('config', $pkg) && array_key_exists('merge', $pkg['config']) && false === $pkg['config']['merge']) {
+                // Do not merge this package
+                continue;
+            }
+
             $pkgComposerFile = realpath($input->getOption('working-dir') . '/' . $pkg['path'] . '/composer.json');
             if (!file_exists($pkgComposerFile)) {
                 $output->writeln(sprintf('No "%s" found, skipping', $pkgComposerFile));
@@ -116,6 +121,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $io->text(sprintf('Updated "%s"', $rootComposerJsonFile->getRealPath()));
         }
 
+        // @todo if not dry-run, run composer dump
+
         $io->success('Merge Complete');
 
         return self::SUCCESS;

src/SonsOfPHP/Bridge/Aws/Filesystem/composer.json

@@ -10,6 +10,10 @@
     "homepage": "https://github.com/SonsOfPHP/filesystem-aws",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Bridge/Doctrine/Collections/Pager/composer.json

@@ -8,6 +8,10 @@
     "homepage": "https://github.com/SonsOfPHP/pager-doctrine-collections",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Bridge/Doctrine/DBAL/Pager/composer.json

@@ -8,6 +8,10 @@
     "homepage": "https://github.com/SonsOfPHP/pager-doctrine-dbal",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Bridge/Doctrine/EventSourcing/composer.json

@@ -8,6 +8,10 @@
     "homepage": "https://github.com/SonsOfPHP/event-sourcing",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Bridge/Doctrine/ORM/Pager/composer.json

@@ -8,6 +8,10 @@
     "homepage": "https://github.com/SonsOfPHP/pager-doctrine-orm",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Bridge/LiipImagine/Filesystem/composer.json

@@ -13,6 +13,10 @@
     "homepage": "https://github.com/SonsOfPHP/filesystem-liip-imagine",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Bridge/Symfony/Cqrs/composer.json

@@ -12,6 +12,10 @@
     "homepage": "https://github.com/SonsOfPHP/cqrs-symfony",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Bridge/Symfony/EventSourcing/composer.json

@@ -8,6 +8,10 @@
     "homepage": "https://github.com/SonsOfPHP/event-sourcing-symfony",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Bridge/Twig/Money/composer.json

@@ -10,6 +10,10 @@
     "homepage": "https://github.com/SonsOfPHP/money",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Assert/composer.json

@@ -8,6 +8,10 @@
     "homepage": "https://github.com/SonsOfPHP/assert",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Cache/composer.json

@@ -11,6 +11,10 @@
     "homepage": "https://github.com/SonsOfPHP/cache",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Clock/composer.json

@@ -16,6 +16,10 @@
     "homepage": "https://github.com/SonsOfPHP/clock",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Container/composer.json

@@ -10,6 +10,10 @@
     "homepage": "https://github.com/SonsOfPHP/container",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Cookie/composer.json

@@ -8,6 +8,10 @@
     "homepage": "https://github.com/SonsOfPHP/cookie",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Cqrs/composer.json

@@ -12,6 +12,10 @@
     "homepage": "https://github.com/SonsOfPHP/cqrs",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/EventDispatcher/composer.json

@@ -9,6 +9,10 @@
     "homepage": "https://github.com/SonsOfPHP/event-dispatcher",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/EventSourcing/composer.json

@@ -8,6 +8,10 @@
     "homepage": "https://github.com/SonsOfPHP/event-sourcing",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/FeatureToggle/composer.json

@@ -14,6 +14,10 @@
     "homepage": "https://github.com/SonsOfPHP/feature-toggle",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Filesystem/composer.json

@@ -10,6 +10,10 @@
     "homepage": "https://github.com/SonsOfPHP/filesystem",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/HttpFactory/composer.json

@@ -10,6 +10,10 @@
     "homepage": "https://github.com/SonsOfPHP/http-factory",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/HttpHandler/composer.json

@@ -10,6 +10,10 @@
     "homepage": "https://github.com/SonsOfPHP/http-handler",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/HttpMessage/composer.json

@@ -10,6 +10,10 @@
     "homepage": "https://github.com/SonsOfPHP/http-message",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Json/composer.json

@@ -8,6 +8,10 @@
     "homepage": "https://github.com/SonsOfPHP/json",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Link/composer.json

@@ -10,6 +10,10 @@
     "homepage": "https://github.com/SonsOfPHP/link",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Logger/composer.json

@@ -10,6 +10,10 @@
     "homepage": "https://github.com/SonsOfPHP/logger",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"

src/SonsOfPHP/Component/Mailer/composer.json

@@ -8,6 +8,10 @@
     "homepage": "https://github.com/SonsOfPHP/mailer",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Sons of PHP Community",
+            "homepage": "https://github.com/SonsOfPHP/sonsofphp/graphs/contributors"
+        },
         {
             "name": "Joshua Estes",
             "email": "[email protected]"