Skip to content

Commit b4b0c09

Browse files
committed
Merge children library
1 parent 3630a3a commit b4b0c09

File tree

59 files changed

+131
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+131
-222
lines changed

β€Žcomposer.json

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,25 @@
1212
"php": "^8.1",
1313
"type-lang/parser": "^1.4"
1414
},
15-
"replace": {
16-
"type-lang/phpdoc-docblock": "*"
17-
},
1815
"autoload": {
1916
"psr-4": {
20-
"TypeLang\\PHPDoc\\": "src",
21-
"TypeLang\\PHPDoc\\DocBlock\\": "libs/phpdoc-docblock/src"
22-
}
17+
"TypeLang\\PHPDoc\\": "src"
18+
},
19+
"files": [
20+
"src/polyfill.php"
21+
]
2322
},
2423
"require-dev": {
2524
"friendsofphp/php-cs-fixer": "^3.70",
26-
"phpdocumentor/reflection-docblock": "^5.6",
2725
"phpstan/phpstan": "^2.1",
2826
"phpstan/phpstan-strict-rules": "^2.0",
2927
"phpunit/phpunit": "^10.5|^11.0|^12.0",
30-
"symfony/var-dumper": "^5.4|^6.0|^7.0",
31-
"symplify/monorepo-builder": "^11.2"
28+
"symfony/var-dumper": "^5.4|^6.0|^7.0"
3229
},
3330
"autoload-dev": {
3431
"psr-4": {
35-
"TypeLang\\PHPDoc\\DocBlock\\Tests\\": "libs/phpdoc-docblock/tests",
3632
"TypeLang\\PHPDoc\\Tests\\": "tests"
37-
},
38-
"files": [
39-
"libs/phpdoc-docblock/src/polyfill.php"
40-
]
33+
}
4134
},
4235
"extra": {
4336
"branch-alias": {
@@ -66,8 +59,7 @@
6659
"linter:baseline": "phpstan analyse --configuration phpstan.neon --generate-baseline",
6760
"phpcs": "@phpcs:check",
6861
"phpcs:check": "php-cs-fixer fix --config=.php-cs-fixer.php --allow-risky=yes --dry-run --verbose --diff",
69-
"phpcs:fix": "php-cs-fixer fix --config=.php-cs-fixer.php --allow-risky=yes --verbose --diff",
70-
"dev:merge": "monorepo-builder merge"
62+
"phpcs:fix": "php-cs-fixer fix --config=.php-cs-fixer.php --allow-risky=yes --verbose --diff"
7163
},
7264
"minimum-stability": "dev",
7365
"prefer-stable": true

β€Žlibs/phpdoc-docblock/composer.json

Lines changed: 0 additions & 65 deletions
This file was deleted.

β€Žlibs/phpdoc-docblock/src/polyfill.php

Lines changed: 0 additions & 39 deletions
This file was deleted.

β€Žlibs/phpdoc-docblock/tests/TestCase.php

Lines changed: 0 additions & 11 deletions
This file was deleted.

β€Žmonorepo-builder.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
Β (0)