General Updates and fixes

.github/CODEOWNERS

@@ -1,39 +1,32 @@
 # Packages
-/packages/autoloader/ @JoshuaEstes
-/packages/bard/ @JoshuaEstes
-/packages/cache/ @JoshuaEstes
-/packages/clock/ @JoshuaEstes
-/packages/cqrs/ @JoshuaEstes
-/packages/cqrs-bundle/ @JoshuaEstes
-/packages/cqrs-symfony/ @JoshuaEstes
-/packages/crypto/ @JoshuaEstes
-/packages/csv/ @JoshuaEstes
-/packages/event-dispatcher/ @JoshuaEstes
-/packages/event-sourcing/ @JoshuaEstes
-/packages/event-sourcing-bundle/ @JoshuaEstes
-/packages/event-sourcing-doctrine/ @JoshuaEstes
-/packages/event-sourcing-symfony/ @JoshuaEstes
-/packages/faker/ @JoshuaEstes
-/packages/feature-toggle/ @JoshuaEstes
-/packages/feature-toggle-bundle/ @JoshuaEstes
-/packages/feature-toggle-doctrine/ @JoshuaEstes
-/packages/feature-toggle-symfony/ @JoshuaEstes
-/packages/filesystem/ @JoshuaEstes
-/packages/filesystem-bundle/ @JoshuaEstes
-/packages/http-client/ @JoshuaEstes
-/packages/http-factory/ @JoshuaEstes
-/packages/http-handler/ @JoshuaEstes
-/packages/http-message/ @JoshuaEstes
-/packages/json/ @JoshuaEstes
-/packages/link/ @JoshuaEstes
-/packages/logger/ @JoshuaEstes
-/packages/money/ @JoshuaEstes
-/packages/money-doctrine/ @JoshuaEstes
-/packages/pdf/ @JoshuaEstes
-/packages/phonenumber/ @JoshuaEstes
-/packages/queue/ @JoshuaEstes
-/packages/semver/ @JoshuaEstes
-/packages/stopwatch/ @JoshuaEstes
-/packages/stripe/ @JoshuaEstes
-/packages/stripe-bundle/ @JoshuaEstes
-/packages/xml/ @JoshuaEstes
+/src/SonsOfPHP/Bard @JoshuaEstes
+/src/SonsOfPHP/Bridge/Doctrine/EventSourcing @JoshuaEstes
+/src/SonsOfPHP/Bridge/Doctrine/FeatureToggle @JoshuaEstes
+/src/SonsOfPHP/Bridge/Doctrine/Money @JoshuaEstes
+/src/SonsOfPHP/Bridge/Symfony/Cqrs @JoshuaEstes
+/src/SonsOfPHP/Bridge/Symfony/EventSourcing @JoshuaEstes
+/src/SonsOfPHP/Bridge/Symfony/Filesystem @JoshuaEstes
+/src/SonsOfPHP/Bundle/Cqrs @JoshuaEstes
+/src/SonsOfPHP/Bundle/FeatureToggle @JoshuaEstes
+/src/SonsOfPHP/Bundle/Filesystem @JoshuaEstes
+/src/SonsOfPHP/Component/Autoloader @JoshuaEstes
+/src/SonsOfPHP/Component/Cache @JoshuaEstes
+/src/SonsOfPHP/Component/Clock @JoshuaEstes
+/src/SonsOfPHP/Component/Cqrs @JoshuaEstes
+/src/SonsOfPHP/Component/Cvs @JoshuaEstes
+/src/SonsOfPHP/Component/EventDispatcher @JoshuaEstes
+/src/SonsOfPHP/Component/EventSourcing @JoshuaEstes
+/src/SonsOfPHP/Component/FeatureToggle @JoshuaEstes
+/src/SonsOfPHP/Component/Faker @JoshuaEstes
+/src/SonsOfPHP/Component/Filesystem @JoshuaEstes
+/src/SonsOfPHP/Component/HttpClient @JoshuaEstes
+/src/SonsOfPHP/Component/HttpFactory @JoshuaEstes
+/src/SonsOfPHP/Component/HttpHandler @JoshuaEstes
+/src/SonsOfPHP/Component/HttpMessage @JoshuaEstes
+/src/SonsOfPHP/Component/Json @JoshuaEstes
+/src/SonsOfPHP/Component/Logger @JoshuaEstes
+/src/SonsOfPHP/Component/Money @JoshuaEstes
+/src/SonsOfPHP/Component/Pdf @JoshuaEstes
+/src/SonsOfPHP/Component/PhoneNumber @JoshuaEstes
+/src/SonsOfPHP/Component/Queue @JoshuaEstes
+/src/SonsOfPHP/Component/Version @JoshuaEstes

.github/labeler.yml

@@ -2,39 +2,49 @@ docs:
   - docs/*
 
 Bard:
+  - docs/bard/*
   - packages/bard/*
+  - src/SonsOfPHP/Bard/*
 
 Clock:
   - docs/components/clock/*
   - packages/clock/*
+  - src/SonsOfPHP/Component/Clock/*
 
 CQRS:
   - docs/components/cqrs/*
   - packages/cqrs/*
   - packages/cqrs-symfony/*
+  - src/SonsOfPHP/**/Cqrs/*
 
 EventDispatcher:
   - docs/components/event-dispatcher/*
   - packages/event-dispatcher/*
+  - src/SonsOfPHP/**/EventDispatcher/*
 
 EventSourcing:
   - docs/components/event-sourcing/*
   - packages/event-sourcing/*
   - packages/event-sourcing-doctrine/*
   - packages/event-sourcing-symfony/*
+  - src/SonsOfPHP/**/EventSourcing/*
 
 FeatureToggle:
   - docs/components/feature-toggle/*
   - packages/feature-toggle/*
+  - src/SonsOfPHP/**/FeatureToggle/*
 
 JSON:
   - docs/components/json/*
   - packages/json/*
+  - src/SonsOfPHP/**/Json/*
 
 Money:
   - docs/components/money/*
   - packages/money/*
+  - src/SonsOfPHP/**/Money/*
 
 Version:
   - docs/components/version/*
   - packages/version/*
+  - src/SonsOfPHP/**/Version/*

.php-cs-fixer.dist.php

@@ -1,16 +1,17 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-    ->in('packages/')
+    ->in(__DIR__)
+    ->exclude('docs')
+    ->exclude('tools')
+    ->exclude('vendor')
 ;
 
 $config = new PhpCsFixer\Config();
 return $config->setRules([
-        // Rule sets
-        '@PER-CS2.0' => true,
-        '@PHP80Migration:risky' => true,
-        '@PHP81Migration' => true,
-        '@PHPUnit100Migration:risky' => true,
-    ])
-    ->setFinder($finder)
-;
+    // Rule sets
+    '@PER-CS' => true,
+    '@PHP80Migration:risky' => true,
+    '@PHP81Migration' => true,
+    '@PHPUnit100Migration:risky' => true,
+])->setFinder($finder);

bard.json

@@ -2,55 +2,55 @@
     "version": "0.3.7",
     "packages": [
         {
-            "path": "packages/bard/",
+            "path": "src/SonsOfPHP/Bard",
             "repository": "[email protected]:SonsOfPHP/bard.git"
         },
         {
-            "path": "packages/clock/",
+            "path": "src/SonsOfPHP/Component/Clock",
             "repository": "[email protected]:SonsOfPHP/clock.git"
         },
         {
-            "path": "packages/cqrs/",
+            "path": "src/SonsOfPHP/Component/Cqrs",
             "repository": "[email protected]:SonsOfPHP/cqrs.git"
         },
         {
-            "path": "packages/cqrs-bundle/",
+            "path": "src/SonsOfPHP/Bundle/Cqrs",
             "repository": "[email protected]:SonsOfPHP/cqrs-bundle.git"
         },
         {
-            "path": "packages/cqrs-symfony/",
+            "path": "src/SonsOfPHP/Bridge/Symfony/Cqrs",
             "repository": "[email protected]:SonsOfPHP/cqrs-symfony.git"
         },
         {
-            "path": "packages/event-dispatcher/",
+            "path": "src/SonsOfPHP/Bridge/Symfony/EventSourcing",
+            "repository": "[email protected]:SonsOfPHP/event-sourcing-symfony.git"
+        },
+        {
+            "path": "src/SonsOfPHP/Component/EventDispatcher",
             "repository": "[email protected]:SonsOfPHP/event-dispatcher.git"
         },
         {
-            "path": "packages/event-sourcing/",
+            "path": "src/SonsOfPHP/Component/EventSourcing",
             "repository": "[email protected]:SonsOfPHP/event-sourcing.git"
         },
         {
-            "path": "packages/event-sourcing-doctrine/",
+            "path": "src/SonsOfPHP/Bridge/Doctrine/EventSourcing",
             "repository": "[email protected]:SonsOfPHP/event-sourcing-doctrine.git"
         },
         {
-            "path": "packages/event-sourcing-symfony/",
-            "repository": "[email protected]:SonsOfPHP/event-sourcing-symfony.git"
-        },
-        {
-            "path": "packages/feature-toggle/",
+            "path": "src/SonsOfPHP/Component/FeatureToggle",
             "repository": "[email protected]:SonsOfPHP/feature-toggle.git"
         },
         {
-            "path": "packages/json/",
+            "path": "src/SonsOfPHP/Component/Json",
             "repository": "[email protected]:SonsOfPHP/json.git"
         },
         {
-            "path": "packages/money/",
+            "path": "src/SonsOfPHP/Component/Money",
             "repository": "[email protected]:SonsOfPHP/money.git"
         },
         {
-            "path": "packages/version/",
+            "path": "src/SonsOfPHP/Component/Version",
             "repository": "[email protected]:SonsOfPHP/version.git"
         }
     ]

packages/bard/src/Console/Application.php → src/SonsOfPHP/Bard/src/Console/Application.php

@@ -27,6 +27,7 @@ protected function getDefaultCommands(): array
             new \SonsOfPHP\Bard\Console\Command\InitCommand(),
             new \SonsOfPHP\Bard\Console\Command\InstallCommand(),
             new \SonsOfPHP\Bard\Console\Command\MergeCommand(),
+            new \SonsOfPHP\Bard\Console\Command\PullCommand(),
             new \SonsOfPHP\Bard\Console\Command\PushCommand(),
             new \SonsOfPHP\Bard\Console\Command\ReleaseCommand(),
             new \SonsOfPHP\Bard\Console\Command\SplitCommand(),

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

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SonsOfPHP\Bard\Console\Command;
+
+use SonsOfPHP\Bard\JsonFile;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Process\Process;
+
+/**
+ * @author Joshua Estes <[email protected]>
+ */
+final class PullCommand extends AbstractCommand
+{
+    protected static $defaultName = 'pull';
+
+    protected function configure(): void
+    {
+        $this
+            ->setDescription('Pull changes from package repos')
+            ->addOption('branch', null, InputOption::VALUE_REQUIRED, 'What branch we working with?', 'main')
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $bardConfig = new JsonFile($input->getOption('working-dir') . '/bard.json');
+        $formatter  = $this->getHelper('formatter');
+        $io         = new SymfonyStyle($input, $output);
+
+        foreach ($bardConfig->getSection('packages') as $pkg) {
+            $pkgComposerFile     = realpath($input->getOption('working-dir') . '/' . $pkg['path'] . '/composer.json');
+            $pkgComposerJsonFile = new JsonFile($pkgComposerFile);
+            $pkgName             = $pkgComposerJsonFile->getSection('name');
+            $io->text(sprintf('Pushing <info>%s</>', $pkgName));
+
+            $commands = [
+                ['git', 'subtree', 'pull', '-P', $pkg['path'], $pkg['repository'], $input->getOption('branch'), '--squash'],
+            ];
+
+            foreach ($commands as $cmd) {
+                $process = new Process($cmd);
+                $io->text($process->getCommandLine());
+                $this->getHelper('process')
+                    ->mustRun($output, $process, sprintf('There was and error running command: %s', $process->getCommandLine()))
+                    ->wait();
+            }
+        }
+
+        $io->success('All Packages have been published.');
+
+        return self::SUCCESS;
+    }
+}