Merge Pr 67 (#68)

* Add support/funding sections * Rename abstract test class to avoid PHPUnit warning --------- Co-authored-by: Michiel Rook <[email protected]>
symplify · Nov 15, 2023 · 12fc9fe · 12fc9fe
1 parent e9ffc96
commit 12fc9fe
Show file tree

Hide file tree

Showing 27 changed files with 101 additions and 48 deletions.
diff --git a/config/config.php b/config/config.php
@@ -46,6 +46,8 @@
         ComposerJsonSection::HOMEPAGE,
         ComposerJsonSection::LICENSE,
         ComposerJsonSection::AUTHORS,
+        ComposerJsonSection::SUPPORT,
+        ComposerJsonSection::FUNDING,
         ComposerJsonSection::BIN,
         ComposerJsonSection::REQUIRE,
         ComposerJsonSection::REQUIRE_DEV,

diff --git a/packages-tests/ComposerJsonManipulator/ComposerJsonFactory/Source/full_composer.json b/packages-tests/ComposerJsonManipulator/ComposerJsonFactory/Source/full_composer.json
@@ -7,6 +7,16 @@
     "require": {
         "php": ">=7.3"
     },
+    "support": {
+        "email": "[email protected]",
+        "irc": "irc://irc.freenode.org/example"
+    },
+    "funding": [
+        {
+            "type": "example",
+            "url": "https://www.patreon.com/example"
+        }
+    ],
     "require-dev": {
         "phpunit/phpunit": "^8.5|^9.4"
     },

diff --git a/...edAndDecoratedComposerJsonFactoryTest.php → ...MergedAndDecoratedComposerJsonFactory.php b/...edAndDecoratedComposerJsonFactoryTest.php → ...MergedAndDecoratedComposerJsonFactory.php
@@ -5,10 +5,10 @@
 namespace Symplify\MonorepoBuilder\Tests\Merge\Application;
 
 use Symplify\MonorepoBuilder\Merge\Application\MergedAndDecoratedComposerJsonFactory;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class MergedAndDecoratedComposerJsonFactoryTest extends AbstractComposerJsonDecoratorTest
+final class MergedAndDecoratedComposerJsonFactory extends AbstractComposerJsonDecorator
 {
     private MergedAndDecoratedComposerJsonFactory $mergedAndDecoratedComposerJsonFactory;
 

diff --git a/...tor/AbstractComposerJsonDecoratorTest.php → ...corator/AbstractComposerJsonDecorator.php b/...tor/AbstractComposerJsonDecoratorTest.php → ...corator/AbstractComposerJsonDecorator.php
@@ -11,7 +11,7 @@
 use Symplify\PackageBuilder\Testing\AbstractKernelTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-abstract class AbstractComposerJsonDecoratorTest extends AbstractKernelTestCase
+abstract class AbstractComposerJsonDecorator extends AbstractKernelTestCase
 {
     protected ComposerJsonFactory $composerJsonFactory;
 

diff --git a/...tor/AppenderComposerJsonDecoratorTest.php → ...corator/AppenderComposerJsonDecorator.php b/...tor/AppenderComposerJsonDecoratorTest.php → ...corator/AppenderComposerJsonDecorator.php
@@ -7,9 +7,9 @@
 use Symplify\MonorepoBuilder\ComposerJsonManipulator\ComposerJsonFactory;
 use Symplify\MonorepoBuilder\Kernel\MonorepoBuilderKernel;
 use Symplify\MonorepoBuilder\Merge\ComposerJsonDecorator\AppenderComposerJsonDecorator;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 
-final class AppenderComposerJsonDecoratorTest extends AbstractComposerJsonDecoratorTest
+final class AppenderComposerJsonDecorator extends AbstractComposerJsonDecorator
 {
     private AppenderComposerJsonDecorator $appenderComposerJsonDecorator;
 

diff --git a/...ator/RemoverComposerJsonDecoratorTest.php → ...ecorator/RemoverComposerJsonDecorator.php b/...ator/RemoverComposerJsonDecoratorTest.php → ...ecorator/RemoverComposerJsonDecorator.php
@@ -9,11 +9,11 @@
 use Symplify\MonorepoBuilder\ComposerJsonManipulator\ValueObject\ComposerJsonSection;
 use Symplify\MonorepoBuilder\Kernel\MonorepoBuilderKernel;
 use Symplify\MonorepoBuilder\Merge\ComposerJsonDecorator\RemoverComposerJsonDecorator;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 use Symplify\MonorepoBuilder\ValueObject\Option;
 use Symplify\PackageBuilder\Parameter\ParameterProvider;
 
-final class RemoverComposerJsonDecoratorTest extends AbstractComposerJsonDecoratorTest
+final class RemoverComposerJsonDecorator extends AbstractComposerJsonDecorator
 {
     /**
      * @var mixed[]

diff --git a/...positoryPathComposerJsonDecoratorTest.php → ...r/RepositoryPathComposerJsonDecorator.php b/...positoryPathComposerJsonDecoratorTest.php → ...r/RepositoryPathComposerJsonDecorator.php
@@ -9,9 +9,9 @@
 use Symplify\MonorepoBuilder\ComposerJsonManipulator\ValueObject\ComposerJsonSection;
 use Symplify\MonorepoBuilder\Kernel\MonorepoBuilderKernel;
 use Symplify\MonorepoBuilder\Merge\ComposerJsonDecorator\RepositoryPathComposerJsonDecorator;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 
-final class RepositoryPathComposerJsonDecoratorTest extends AbstractComposerJsonDecoratorTest
+final class RepositoryPathComposerJsonDecorator extends AbstractComposerJsonDecorator
 {
     /**
      * @var mixed[]

diff --git a/...r/RootRemoveComposerJsonDecoratorTest.php → ...rator/RootRemoveComposerJsonDecorator.php b/...r/RootRemoveComposerJsonDecoratorTest.php → ...rator/RootRemoveComposerJsonDecorator.php
@@ -6,12 +6,12 @@
 
 use Symplify\MonorepoBuilder\Kernel\MonorepoBuilderKernel;
 use Symplify\MonorepoBuilder\Merge\ComposerJsonMerger;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 
 /**
  * @see \Symplify\MonorepoBuilder\Merge\ComposerJsonDecorator\RootRemoveComposerJsonDecorator
  */
-final class RootRemoveComposerJsonDecoratorTest extends AbstractComposerJsonDecoratorTest
+final class RootRemoveComposerJsonDecorator extends AbstractComposerJsonDecorator
 {
     private ComposerJsonMerger $composerJsonMerger;
 

diff --git a/...oserJsonMerger/ComposerJsonMergerTest.php → ...ComposerJsonMerger/ComposerJsonMerger.php b/...oserJsonMerger/ComposerJsonMergerTest.php → ...ComposerJsonMerger/ComposerJsonMerger.php
@@ -8,10 +8,10 @@
 use Iterator;
 use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
 use Symplify\MonorepoBuilder\Merge\ComposerJsonMerger;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class ComposerJsonMergerTest extends AbstractComposerJsonDecoratorTest
+final class ComposerJsonMerger extends AbstractComposerJsonDecorator
 {
     private ComposerJsonMerger $composerJsonMerger;
 

diff --git a/...yMerger/MinimalStabilityKeyMergerTest.php → ...erKeyMerger/MinimalStabilityKeyMerger.php b/...yMerger/MinimalStabilityKeyMergerTest.php → ...erKeyMerger/MinimalStabilityKeyMerger.php
@@ -8,13 +8,13 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
 use Symplify\MonorepoBuilder\Merge\ComposerKeyMerger\MinimalStabilityKeyMerger;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
 /**
  * @coversDefaultClass \Symplify\MonorepoBuilder\Merge\ComposerKeyMerger\MinimalStabilityKeyMerger
  */
-final class MinimalStabilityKeyMergerTest extends AbstractComposerJsonDecoratorTest
+final class MinimalStabilityKeyMerger extends AbstractComposerJsonDecorator
 {
     #[DataProvider('provideData')]
     public function testFixture(SmartFileInfo $fixtureFileInfo): void

diff --git a/...s/Merge/Package/AbstractMergeTestCase.php → ...tests/Merge/Package/AbstractMergeCase.php b/...s/Merge/Package/AbstractMergeTestCase.php → ...tests/Merge/Package/AbstractMergeCase.php
@@ -7,11 +7,11 @@
 use Symfony\Component\Finder\Finder;
 use Symplify\MonorepoBuilder\ComposerJsonManipulator\ValueObject\ComposerJson;
 use Symplify\MonorepoBuilder\Merge\ComposerJsonMerger;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 use Symplify\SmartFileSystem\Finder\FinderSanitizer;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-abstract class AbstractMergeTestCase extends AbstractComposerJsonDecoratorTest
+abstract class AbstractMergeCase extends AbstractComposerJsonDecorator
 {
     private ComposerJsonMerger $composerJsonMerger;
 

diff --git a/...sts/Merge/Package/CombineStringsToArrayJsonMerger/CombineStringsToArrayJsonMergerTest.php b/...sts/Merge/Package/CombineStringsToArrayJsonMerger/CombineStringsToArrayJsonMergerTest.php
@@ -4,9 +4,9 @@
 
 namespace Symplify\MonorepoBuilder\Tests\Merge\Package\CombineStringsToArrayJsonMerger;
 
-use Symplify\MonorepoBuilder\Tests\Merge\Package\AbstractMergeTestCase;
+use Symplify\MonorepoBuilder\Tests\Merge\Package\AbstractMergeCase;
 
-final class CombineStringsToArrayJsonMergerTest extends AbstractMergeTestCase
+final class CombineStringsToArrayJsonMergerTest extends AbstractMergeCase
 {
     public function testIdenticalNamespaces(): void
     {

diff --git a/packages-tests/Merge/Package/PackageComposerJsonMergerTest.php b/packages-tests/Merge/Package/PackageComposerJsonMergerTest.php
@@ -4,7 +4,7 @@
 
 namespace Symplify\MonorepoBuilder\Tests\Merge\Package;
 
-final class PackageComposerJsonMergerTest extends AbstractMergeTestCase
+final class PackageComposerJsonMergerTest extends AbstractMergeCase
 {
     public function test(): void
     {

diff --git a/...thResolver/AutoloadPathNormalizerTest.php → ...e/PathResolver/AutoloadPathNormalizer.php b/...thResolver/AutoloadPathNormalizerTest.php → ...e/PathResolver/AutoloadPathNormalizer.php
@@ -5,10 +5,10 @@
 namespace Symplify\MonorepoBuilder\Tests\Merge\PathResolver;
 
 use Symplify\MonorepoBuilder\Merge\PathResolver\AutoloadPathNormalizer;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class AutoloadPathNormalizerTest extends AbstractComposerJsonDecoratorTest
+final class AutoloadPathNormalizer extends AbstractComposerJsonDecorator
 {
     private AutoloadPathNormalizer $autoloadPathNormalizer;
 

diff --git a/...ver/ComposerPatchesPathNormalizerTest.php → ...esolver/ComposerPatchesPathNormalizer.php b/...ver/ComposerPatchesPathNormalizerTest.php → ...esolver/ComposerPatchesPathNormalizer.php
@@ -5,9 +5,9 @@
 namespace Symplify\MonorepoBuilder\Tests\Merge\PathResolver;
 
 use Symplify\MonorepoBuilder\Merge\PathResolver\ComposerPatchesPathNormalizer;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 
-final class ComposerPatchesPathNormalizerTest extends AbstractComposerJsonDecoratorTest
+final class ComposerPatchesPathNormalizer extends AbstractComposerJsonDecorator
 {
     protected function setUp(): void
     {

diff --git a/...rsionPropagator/VersionPropagaterTest.php → ...e/VersionPropagator/VersionPropagater.php b/...rsionPropagator/VersionPropagaterTest.php → ...e/VersionPropagator/VersionPropagater.php
@@ -8,10 +8,10 @@
 use Iterator;
 use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
 use Symplify\MonorepoBuilder\Propagate\VersionPropagator;
-use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecoratorTest;
+use Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AbstractComposerJsonDecorator;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class VersionPropagaterTest extends AbstractComposerJsonDecoratorTest
+final class VersionPropagater extends AbstractComposerJsonDecorator
 {
     private VersionPropagator $versionPropagator;
 

diff --git a/packages/ComposerJsonManipulator/ComposerJsonFactory.php b/packages/ComposerJsonManipulator/ComposerJsonFactory.php
@@ -156,6 +156,14 @@ public function createFromArray(array $jsonArray): ComposerJson
             $composerJson->setProvide($jsonArray[ComposerJsonSection::PROVIDE]);
         }
 
+        if (isset($jsonArray[ComposerJsonSection::FUNDING])) {
+            $composerJson->setFunding($jsonArray[ComposerJsonSection::FUNDING]);
+        }
+
+        if (isset($jsonArray[ComposerJsonSection::SUPPORT])) {
+            $composerJson->setSupport($jsonArray[ComposerJsonSection::SUPPORT]);
+        }
+
         $orderedKeys = array_keys($jsonArray);
         $composerJson->setOrderedKeys($orderedKeys);
 

diff --git a/packages/ComposerJsonManipulator/ValueObject/ComposerJson.php b/packages/ComposerJsonManipulator/ValueObject/ComposerJson.php
@@ -66,6 +66,16 @@ final class ComposerJson
      */
     private array $extra = [];
 
+    /**
+     * @var mixed[]
+     */
+    private array $funding = [];
+
+    /**
+     * @var mixed[]
+     */
+    private array $support = [];
+
     /**
      * @var array<string, string>
      */
@@ -336,6 +346,38 @@ public function setExtra(array $extra): void
         $this->extra = $extra;
     }
 
+    /**
+     * @return mixed[]
+     */
+    public function getFunding(): array
+    {
+        return $this->funding;
+    }
+
+    /**
+     * @param mixed[] $funding
+     */
+    public function setFunding(array $funding): void
+    {
+        $this->funding = $funding;
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public function getSupport(): array
+    {
+        return $this->support;
+    }
+
+    /**
+     * @param mixed[] $support
+     */
+    public function setSupport(array $support): void
+    {
+        $this->support = $support;
+    }
+
     public function getName(): ?string
     {
         return $this->name;
@@ -416,6 +458,8 @@ public function getJsonArray(): array
             ComposerJsonSection::CONFLICT => $this->conflicts,
             ComposerJsonSection::PROVIDE => $this->provide,
             ComposerJsonSection::VERSION => $this->version,
+            ComposerJsonSection::FUNDING => $this->funding,
+            ComposerJsonSection::SUPPORT => $this->support,
         ]);
 
         if ($this->minimumStability !== null) {

diff --git a/packages/ComposerJsonManipulator/ValueObject/ComposerJsonSection.php b/packages/ComposerJsonManipulator/ValueObject/ComposerJsonSection.php
@@ -129,4 +129,14 @@ final class ComposerJsonSection
      * @var string
      */
     public const VERSION = 'version';
+
+    /**
+     * @var string
+     */
+    public const FUNDING = 'funding';
+
+    /**
+     * @var string
+     */
+    public const SUPPORT = 'support';
 }
diff --git a/packages/Merge/Application/MergedAndDecoratedComposerJsonFactory.php b/packages/Merge/Application/MergedAndDecoratedComposerJsonFactory.php
@@ -9,9 +9,6 @@
 use Symplify\MonorepoBuilder\Merge\Contract\ComposerJsonDecoratorInterface;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-/**
- * @see \Symplify\MonorepoBuilder\Tests\Merge\Application\MergedAndDecoratedComposerJsonFactoryTest
- */
 final class MergedAndDecoratedComposerJsonFactory
 {
     /**

diff --git a/packages/Merge/ComposerJsonDecorator/AppenderComposerJsonDecorator.php b/packages/Merge/ComposerJsonDecorator/AppenderComposerJsonDecorator.php
@@ -9,9 +9,6 @@
 use Symplify\MonorepoBuilder\Merge\Configuration\ModifyingComposerJsonProvider;
 use Symplify\MonorepoBuilder\Merge\Contract\ComposerJsonDecoratorInterface;
 
-/**
- * @see \Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\AppenderComposerJsonDecorator\AppenderComposerJsonDecoratorTest
- */
 final class AppenderComposerJsonDecorator implements ComposerJsonDecoratorInterface
 {
     public function __construct(

diff --git a/packages/Merge/ComposerJsonDecorator/RemoverComposerJsonDecorator.php b/packages/Merge/ComposerJsonDecorator/RemoverComposerJsonDecorator.php
@@ -9,10 +9,6 @@
 use Symplify\MonorepoBuilder\Merge\Contract\ComposerJsonDecoratorInterface;
 use Symplify\MonorepoBuilder\ValueObject\Option;
 
-/**
- * @see \Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\RemoverComposerJsonDecoratorTest
- * @see \Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\RemoverComposerJsonDecorator\RemoverComposerJsonDecoratorTest
- */
 final class RemoverComposerJsonDecorator implements ComposerJsonDecoratorInterface
 {
     public function __construct(

diff --git a/packages/Merge/ComposerJsonDecorator/RepositoryPathComposerJsonDecorator.php b/packages/Merge/ComposerJsonDecorator/RepositoryPathComposerJsonDecorator.php
@@ -7,9 +7,6 @@
 use Symplify\MonorepoBuilder\ComposerJsonManipulator\ValueObject\ComposerJson;
 use Symplify\MonorepoBuilder\Merge\Contract\ComposerJsonDecoratorInterface;
 
-/**
- * @see \Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\RepositoryPathComposerJsonDecorator\RepositoryPathComposerJsonDecoratorTest
- */
 final class RepositoryPathComposerJsonDecorator implements ComposerJsonDecoratorInterface
 {
     /**

diff --git a/packages/Merge/ComposerJsonDecorator/RootRemoveComposerJsonDecorator.php b/packages/Merge/ComposerJsonDecorator/RootRemoveComposerJsonDecorator.php
@@ -11,8 +11,6 @@
 /**
  * Remove inter-dependencies in split packages from root, e.g. symfony/console needs symfony/filesystem in package, but
  * it makes no sense to have symfony/filesystem in root of symfony/symfony.
- *
- * @see \Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonDecorator\RootRemoveComposerJsonDecorator\RootRemoveComposerJsonDecoratorTest
  */
 final class RootRemoveComposerJsonDecorator implements ComposerJsonDecoratorInterface
 {

diff --git a/packages/Merge/ComposerJsonMerger.php b/packages/Merge/ComposerJsonMerger.php
@@ -11,9 +11,6 @@
 use Symplify\MonorepoBuilder\Merge\Contract\ComposerKeyMergerInterface;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-/**
- * @see \Symplify\MonorepoBuilder\Tests\Merge\ComposerJsonMerger\ComposerJsonMergerTest
- */
 final class ComposerJsonMerger
 {
     /**

diff --git a/packages/Merge/ComposerKeyMerger/MinimalStabilityKeyMerger.php b/packages/Merge/ComposerKeyMerger/MinimalStabilityKeyMerger.php
@@ -9,9 +9,6 @@
 use Symplify\MonorepoBuilder\ComposerJsonManipulator\ValueObject\ComposerJson;
 use Symplify\MonorepoBuilder\Merge\Contract\ComposerKeyMergerInterface;
 
-/**
- * @see \Symplify\MonorepoBuilder\Tests\Merge\ComposerKeyMerger\MinimalStabilityKeyMergerTest
- */
 final class MinimalStabilityKeyMerger implements ComposerKeyMergerInterface
 {
     public function merge(ComposerJson $mainComposerJson, ComposerJson $newComposerJson): void

diff --git a/phpunit.xml b/phpunit.xml
@@ -2,6 +2,6 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache">
   <testsuite name="all">
     <directory>tests</directory>
-    <directory>packages/*/tests</directory>
+    <directory>packages-tests</directory>
   </testsuite>
 </phpunit>