Skip to content

Commit ed01a7e

Browse files
committed
Move tools' dependencies to separate utils directory
1 parent 854c73f commit ed01a7e

File tree

4 files changed

+47
-36
lines changed

4 files changed

+47
-36
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ CONTRIBUTING.md export-ignore
1717

1818
# contributor/development files
1919
tests/ export-ignore
20-
tools/ export-ignore
2120
utils/ export-ignore
2221
.php-cs-fixer.dist.php export-ignore
2322
.php-cs-fixer.no-header.php export-ignore

composer.json

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,13 @@
1717
"psr/log": "^3.0"
1818
},
1919
"require-dev": {
20-
"codeigniter/coding-standard": "^1.7",
21-
"codeigniter/phpstan-codeigniter": "^1.4",
22-
"ergebnis/composer-normalize": "^2.28",
2320
"fakerphp/faker": "^1.9",
24-
"friendsofphp/php-cs-fixer": "^3.47.1",
2521
"kint-php/kint": "^5.0.4",
2622
"mikey179/vfsstream": "^1.6",
27-
"nexusphp/cs-config": "^3.6",
2823
"nexusphp/tachycardia": "^2.0",
29-
"phpstan/extension-installer": "^1.3",
30-
"phpstan/phpstan": "^1.11",
31-
"phpstan/phpstan-strict-rules": "^1.6",
3224
"phpunit/phpcov": "^9.0.2",
3325
"phpunit/phpunit": "^10.5.16",
34-
"predis/predis": "^1.1 || ^2.0",
35-
"rector/rector": "1.2.1",
36-
"vimeo/psalm": "^5.0"
26+
"predis/predis": "^1.1 || ^2.0"
3727
},
3828
"replace": {
3929
"codeigniter4/framework": "self.version"
@@ -71,15 +61,10 @@
7161
},
7262
"autoload-dev": {
7363
"psr-4": {
74-
"CodeIgniter\\": "tests/system/",
75-
"Utils\\": "utils/"
64+
"CodeIgniter\\": "tests/system/"
7665
}
7766
},
7867
"config": {
79-
"allow-plugins": {
80-
"ergebnis/composer-normalize": true,
81-
"phpstan/extension-installer": true
82-
},
8368
"optimize-autoloader": true,
8469
"preferred-install": "dist",
8570
"sort-packages": true
@@ -90,30 +75,32 @@
9075
}
9176
},
9277
"scripts": {
78+
"post-autoload-dump": [
79+
"@composer update --working-dir=utils"
80+
],
9381
"post-update-cmd": [
94-
"CodeIgniter\\ComposerScripts::postUpdate",
95-
"composer update --working-dir=tools/phpmetrics"
82+
"CodeIgniter\\ComposerScripts::postUpdate"
9683
],
9784
"analyze": [
9885
"Composer\\Config::disableProcessTimeout",
99-
"bash -c \"XDEBUG_MODE=off phpstan analyse\"",
100-
"rector process --dry-run"
86+
"bash -c \"XDEBUG_MODE=off utils/vendor/bin/phpstan analyse\"",
87+
"utils/vendor/bin/rector process --dry-run"
10188
],
10289
"cs": [
10390
"Composer\\Config::disableProcessTimeout",
104-
"php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php",
105-
"php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php",
106-
"php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.tests.php",
107-
"php-cs-fixer fix --ansi --verbose --dry-run --diff"
91+
"utils/vendor/bin/php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php",
92+
"utils/vendor/bin/php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php",
93+
"utils/vendor/bin/php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.tests.php",
94+
"utils/vendor/bin/php-cs-fixer fix --ansi --verbose --dry-run --diff"
10895
],
10996
"cs-fix": [
11097
"Composer\\Config::disableProcessTimeout",
111-
"php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.user-guide.php",
112-
"php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.no-header.php",
113-
"php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.tests.php",
114-
"php-cs-fixer fix --ansi --verbose --diff"
98+
"utils/vendor/bin/php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.user-guide.php",
99+
"utils/vendor/bin/php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.no-header.php",
100+
"utils/vendor/bin/php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.tests.php",
101+
"utils/vendor/bin/php-cs-fixer fix --ansi --verbose --diff"
115102
],
116-
"metrics": "tools/phpmetrics/vendor/bin/phpmetrics --config=phpmetrics.json",
103+
"metrics": "utils/vendor/bin/phpmetrics --config=phpmetrics.json",
117104
"sa": "@analyze",
118105
"style": "@cs-fix",
119106
"test": "phpunit"

tools/phpmetrics/composer.json

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

utils/composer.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"require": {
3+
"php": "^8.1",
4+
"codeigniter/coding-standard": "^1.7",
5+
"codeigniter/phpstan-codeigniter": "^1.4",
6+
"ergebnis/composer-normalize": "^2.28",
7+
"friendsofphp/php-cs-fixer": "^3.47.1",
8+
"nexusphp/cs-config": "^3.6",
9+
"phpstan/extension-installer": "^1.3",
10+
"phpstan/phpstan": "^1.11",
11+
"phpmetrics/phpmetrics": "^2.8 || ^3.0rc6",
12+
"phpstan/phpstan-strict-rules": "^1.6",
13+
"rector/rector": "1.2.1",
14+
"vimeo/psalm": "^5.0"
15+
},
16+
"autoload": {
17+
"psr-4": {
18+
"Utils\\": "src/"
19+
}
20+
},
21+
"config": {
22+
"allow-plugins": {
23+
"ergebnis/composer-normalize": true,
24+
"phpstan/extension-installer": true
25+
},
26+
"optimize-autoloader": true,
27+
"preferred-install": "dist",
28+
"sort-packages": true
29+
}
30+
}

0 commit comments

Comments
 (0)