Merge children library

Author: SerafimArts

composer.json

@@ -12,32 +12,25 @@
         "php": "^8.1",
         "type-lang/parser": "^1.4"
     },
-    "replace": {
-        "type-lang/phpdoc-docblock": "*"
-    },
     "autoload": {
         "psr-4": {
-            "TypeLang\\PHPDoc\\": "src",
-            "TypeLang\\PHPDoc\\DocBlock\\": "libs/phpdoc-docblock/src"
-        }
+            "TypeLang\\PHPDoc\\": "src"
+        },
+        "files": [
+            "src/polyfill.php"
+        ]
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.70",
-        "phpdocumentor/reflection-docblock": "^5.6",
         "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-strict-rules": "^2.0",
         "phpunit/phpunit": "^10.5|^11.0|^12.0",
-        "symfony/var-dumper": "^5.4|^6.0|^7.0",
-        "symplify/monorepo-builder": "^11.2"
+        "symfony/var-dumper": "^5.4|^6.0|^7.0"
     },
     "autoload-dev": {
         "psr-4": {
-            "TypeLang\\PHPDoc\\DocBlock\\Tests\\": "libs/phpdoc-docblock/tests",
             "TypeLang\\PHPDoc\\Tests\\": "tests"
-        },
-        "files": [
-            "libs/phpdoc-docblock/src/polyfill.php"
-        ]
+        }
     },
     "extra": {
         "branch-alias": {
@@ -66,8 +59,7 @@
         "linter:baseline": "phpstan analyse --configuration phpstan.neon --generate-baseline",
         "phpcs": "@phpcs:check",
         "phpcs:check": "php-cs-fixer fix --config=.php-cs-fixer.php --allow-risky=yes --dry-run --verbose --diff",
-        "phpcs:fix": "php-cs-fixer fix --config=.php-cs-fixer.php --allow-risky=yes --verbose --diff",
-        "dev:merge": "monorepo-builder merge"
+        "phpcs:fix": "php-cs-fixer fix --config=.php-cs-fixer.php --allow-risky=yes --verbose --diff"
     },
     "minimum-stability": "dev",
     "prefer-stable": true

libs/phpdoc-docblock/composer.json

@@ -23,10 +23,10 @@ interface TaggedDescriptionInterface extends
     /**
      * Gets a list of components (that is, tags of {@see TagInterface}
      * and descriptions of {@see DescriptionInterface}) that make up the
-     * {@see TaggedDescriptionInterface} in the order in which these
+     * {@see \TypeLang\PHPDoc\DocBlock\Polyfill\Description\TaggedDescriptionInterface} in the order in which these
      * elements are defined.
      *
-     * @var iterable<array-key, TagInterface|DescriptionInterface>
+     * @var DescriptionInterface
      * @readonly
      */
     public iterable $components { get; }

libs/phpdoc-docblock/src/polyfill.php

@@ -2,11 +2,13 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag;
+namespace TypeLang\PHPDoc\DocBlock\Tag\MethodTag;
 
 use TypeLang\Parser\Node\Stmt\Callable\ParameterNode;
 use TypeLang\Parser\Node\Stmt\CallableTypeNode;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
+use TypeLang\PHPDoc\DocBlock\Tag\Tag;
+use TypeLang\PHPDoc\DocBlock\Tag\TypeProviderInterface;
 
 /**
  * The "`@method`" tag is used in situations where a class contains the

libs/phpdoc-docblock/tests/TestCase.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag\Factory;
+namespace TypeLang\PHPDoc\DocBlock\Tag\MethodTag;
 
 use TypeLang\Parser\Node\Stmt\CallableTypeNode;
 use TypeLang\Parser\Parser as TypesParser;
@@ -11,7 +11,7 @@
 use TypeLang\PHPDoc\DocBlock\Content\OptionalValueReader;
 use TypeLang\PHPDoc\DocBlock\Content\Stream;
 use TypeLang\PHPDoc\DocBlock\Content\TypeParserReader;
-use TypeLang\PHPDoc\DocBlock\Tag\MethodTag;
+use TypeLang\PHPDoc\DocBlock\Tag\Factory\TagFactoryInterface;
 use TypeLang\PHPDoc\Parser\Description\DescriptionParserInterface;
 
 /**

monorepo-builder.php

@@ -2,9 +2,12 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag;
+namespace TypeLang\PHPDoc\DocBlock\Tag\ParamTag;
 
 use TypeLang\Parser\Node\Stmt\TypeStatement;
+use TypeLang\PHPDoc\DocBlock\Tag\OptionalTypeProviderInterface;
+use TypeLang\PHPDoc\DocBlock\Tag\Tag;
+use TypeLang\PHPDoc\DocBlock\Tag\VariableProviderInterface;
 
 /**
  * With the "`@param`" tag it is possible to document the type and the intent of

libs/phpdoc-docblock/src/Description/Description.php renamed to src/DocBlock/Description/Description.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag\Factory;
+namespace TypeLang\PHPDoc\DocBlock\Tag\ParamTag;
 
 use TypeLang\Parser\Parser as TypesParser;
 use TypeLang\Parser\ParserInterface as TypesParserInterface;
 use TypeLang\PHPDoc\DocBlock\Content\Stream;
 use TypeLang\PHPDoc\DocBlock\Content\TypeParserReader;
 use TypeLang\PHPDoc\DocBlock\Content\VariableNameReader;
-use TypeLang\PHPDoc\DocBlock\Tag\ParamTag;
+use TypeLang\PHPDoc\DocBlock\Tag\Factory\TagFactoryInterface;
 use TypeLang\PHPDoc\Parser\Description\DescriptionParserInterface;
 
 /**

libs/phpdoc-docblock/src/Description/DescriptionInterface.php renamed to src/DocBlock/Description/DescriptionInterface.php

@@ -2,6 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag;
+namespace TypeLang\PHPDoc\DocBlock\Tag\PropertyTag;
 
 class PropertyReadTag extends PropertyTag {}

libs/phpdoc-docblock/src/Description/DescriptionProviderInterface.php renamed to src/DocBlock/Description/DescriptionProviderInterface.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag\Factory;
+namespace TypeLang\PHPDoc\DocBlock\Tag\PropertyTag;
 
 use TypeLang\Parser\Parser as TypesParser;
 use TypeLang\Parser\ParserInterface as TypesParserInterface;
-use TypeLang\PHPDoc\DocBlock\Tag\PropertyReadTag;
+use TypeLang\PHPDoc\DocBlock\Tag\Factory\TagFactoryInterface;
 use TypeLang\PHPDoc\Parser\Description\DescriptionParserInterface;
 
 /**
@@ -30,8 +30,8 @@ public function create(string $tag, string $content, DescriptionParserInterface
 
         return new PropertyReadTag(
             name: $property->name,
-            type: $property->getType(),
-            variable: $property->getVariable(),
+            type: $property->type,
+            variable: $property->variable,
             description: $property->description,
         );
     }

libs/phpdoc-docblock/src/Description/OptionalDescriptionProviderInterface.php renamed to src/DocBlock/Description/OptionalDescriptionProviderInterface.php

@@ -2,9 +2,12 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag;
+namespace TypeLang\PHPDoc\DocBlock\Tag\PropertyTag;
 
 use TypeLang\Parser\Node\Stmt\TypeStatement;
+use TypeLang\PHPDoc\DocBlock\Tag\OptionalTypeProviderInterface;
+use TypeLang\PHPDoc\DocBlock\Tag\Tag;
+use TypeLang\PHPDoc\DocBlock\Tag\VariableProviderInterface;
 
 /**
  * The "`@property`" tag is used when a class or trait implements the `__get()`

libs/phpdoc-docblock/src/Description/TaggedDescription.php renamed to src/DocBlock/Description/TaggedDescription.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag\Factory;
+namespace TypeLang\PHPDoc\DocBlock\Tag\PropertyTag;
 
 use TypeLang\Parser\Parser as TypesParser;
 use TypeLang\Parser\ParserInterface as TypesParserInterface;
 use TypeLang\PHPDoc\DocBlock\Content\Stream;
 use TypeLang\PHPDoc\DocBlock\Content\TypeParserReader;
 use TypeLang\PHPDoc\DocBlock\Content\VariableNameReader;
-use TypeLang\PHPDoc\DocBlock\Tag\PropertyTag;
+use TypeLang\PHPDoc\DocBlock\Tag\Factory\TagFactoryInterface;
 use TypeLang\PHPDoc\Parser\Description\DescriptionParserInterface;
 
 /**

libs/phpdoc-docblock/src/Description/TaggedDescriptionInterface.php renamed to src/DocBlock/Description/TaggedDescriptionInterface.php

@@ -2,6 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag;
+namespace TypeLang\PHPDoc\DocBlock\Tag\PropertyTag;
 
 class PropertyWriteTag extends PropertyTag {}

libs/phpdoc-docblock/src/DocBlock.php renamed to src/DocBlock/DocBlock.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag\Factory;
+namespace TypeLang\PHPDoc\DocBlock\Tag\PropertyTag;
 
 use TypeLang\Parser\Parser as TypesParser;
 use TypeLang\Parser\ParserInterface as TypesParserInterface;
-use TypeLang\PHPDoc\DocBlock\Tag\PropertyWriteTag;
+use TypeLang\PHPDoc\DocBlock\Tag\Factory\TagFactoryInterface;
 use TypeLang\PHPDoc\Parser\Description\DescriptionParserInterface;
 
 /**
@@ -30,8 +30,8 @@ public function create(string $tag, string $content, DescriptionParserInterface
 
         return new PropertyWriteTag(
             name: $property->name,
-            type: $property->getType(),
-            variable: $property->getVariable(),
+            type: $property->type,
+            variable: $property->variable,
             description: $property->description,
         );
     }

libs/phpdoc-docblock/src/DocBlockInterface.php renamed to src/DocBlock/DocBlockInterface.php

@@ -2,9 +2,11 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\PHPDoc\DocBlock\Tag;
+namespace TypeLang\PHPDoc\DocBlock\Tag\ReturnTag;
 
 use TypeLang\Parser\Node\Stmt\TypeStatement;
+use TypeLang\PHPDoc\DocBlock\Tag\Tag;
+use TypeLang\PHPDoc\DocBlock\Tag\TypeProviderInterface;
 
 /**
  * With the "`@return`" tag it is possible to document the return type of a