[TASK] Add composer plugin to tdk

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Install dependencies
         # Do a clone here to make sure the repository exists on install
         # to avoid missing repository error in composer.
-        run: composer tdk:clone && composer install --no-progress
+        run: composer install --no-progress
 
       - name: phpstan
         run:  ./vendor/bin/phpstan analyse -c .phpstan.neon --no-progress

.gitignore

@@ -3,11 +3,13 @@ var/
 public/
 composer.lock
 .idea
-typo3-core
 packages/*
 !packages/.gitkeep
+!packages/tdk-composer-plugin
 .ddev/
 /config/
 test-acceptance-tdk/
 /tests/_support/_generated
-/.vscode
+/.vscode
+/.php-cs-fixer.cache
+/typo3-core

.gitpod.yml

@@ -4,6 +4,7 @@
 # 8.0 https://gitpod.io/#TDK_PHP_VERSION=8.0,TDK_BRANCH=main,TDK_PATCH_REF=refs%2Fchanges%2F43%2F70643%2F36,TDK_USERNAME=ochorocho,TDK_PATCH_ID=70643/https://github.com/ochorocho/tdk/tree/main
 # Detect php: https://gitpod.io/#TDK_BRANCH=11.5,TDK_PATCH_REF=refs%2Fchanges%2F43%2F70643%2F36,TDK_USERNAME=ochorocho,TDK_PATCH_ID=70643/https://github.com/ochorocho/tdk/tree/main
 # https://gitpod.io/#TDK_BRANCH=11.5,TDK_PATCH_REF=refs%2Fchanges%2F43%2F70643%2F36,TDK_USERNAME=ochorocho,TDK_PATCH_ID=70643/https://github.com/ochorocho/tdk/tree/feature/add-ssh-command
+# Composer Plugin: https://gitpod.io/#TDK_BRANCH=main,TDK_PATCH_REF=refs%2Fchanges%2F43%2F70643%2F36,TDK_USERNAME=ochorocho,TDK_PATCH_ID=70643/https://github.com/ochorocho/tdk/tree/feature/scripts-to-composer-plugin
 
 image: ochorocho/gitpod-tdk:latest
 
@@ -14,14 +15,13 @@ tasks:
       cp -Rp .gitpod/phpstorm .idea
       tdk php "$(php .gitpod/php/version.php)" --no-reload
       gp open .gitpod/info.md
-      composer tdk:clone
-      composer tdk:checkout
       composer install
-      composer tdk:set-git-config
-      composer tdk:enable-hooks -- --force
-      composer tdk:set-commit-template -- --file=./.gitmessage.txt
+      composer tdk:git checkout
+      composer tdk:git config
+      composer tdk:hooks create --force
+      composer tdk:git template --file=./.gitmessage.txt
       tdk ssh-add
-      composer tdk:apply-patch
+      composer tdk:git apply
       composer install
       mkdir -p public/typo3conf
       touch public/FIRST_INSTALL
@@ -34,9 +34,9 @@ tasks:
       sudo service cron start
       sleep 5
       tdk db create
-      composer tdk:help
+      composer tdk:help summary
+      composer tdk:help done
       tdk preview fe
-      gp sync-done tdk-done
 
 vscode:
   extensions:

.gitpod/php/version.php

@@ -1,9 +1,8 @@
 <?php
 
-require dirname(__DIR__) . '/../Scripts/BaseScript.php';
-require dirname(__DIR__) . '/../Scripts/CommonScript.php';
-use Ochorocho\Tdk\Scripts\CommonScript;
+require dirname(__DIR__) . '/../packages/tdk-composer-plugin/src/Service/BaseService.php';
+use Ochorocho\TdkComposer\Service\BaseService;
 
 $branch = getenv('TDK_BRANCH') ?: 'main';
 $composerFile = 'https://raw.githubusercontent.com/TYPO3/typo3/' . $branch . '/composer.json';
-echo CommonScript::getPhpVersion($composerFile) . PHP_EOL;
+echo BaseService::getPhpVersion($composerFile) . PHP_EOL;

.php_cs.php

@@ -1,5 +1,5 @@
 <?php
 
 $config = new PhpCsFixer\Config();
-$config->getFinder()->in([__DIR__ . '/Scripts', __DIR__ . '/tests/Acceptance']);
+$config->getFinder()->in([__DIR__ . '/packages/tdk-composer-plugin', __DIR__ . '/tests/Acceptance']);
 return $config;

.phpstan.neon

@@ -1,4 +1,4 @@
 parameters:
   level: 3
   paths:
-    - Scripts
+    - packages/tdk-composer-plugin

README.md

@@ -25,21 +25,22 @@ composer based TYPO3 CoreDev environment.
 └── typo3-core      # TYPO3 repository (master branch) [email protected]:TYPO3/typo3.git  
 ```
 
-## Additional Composer commands/scripts
+## Additional Composer commands
 
 `composer <command>`
 
-* `tdk:setup`: Setup everything to run a Composer based CoreDev Setup
-* `tdk:clear`: Delete all files and folder
-* `tdk:remove-hooks`: Delete created hooks in `.git/hooks`
-* `tdk:enable-hooks`: Create hooks copied from the TYPO3 repository
-* `tdk:set-commit-template`: Configure TYPO3 repository to use `.gitmessage.txt` as commit message template
+* `tdk:cleanup`: Delete all files and folder including the `typo3-core` repository
+* `tdk:hooks <create|delete>`: Create/delete created hooks in `.git/hooks`
+* `tdk:git <action>`
+  * `config`: Set git name, email and pushurl
+  * `template`: Configure TYPO3 repository to use `.gitmessage.txt` as commit message template
+  * `apply`: Apply Gerrit patch e.g. `composer tdk:git apply --ref=refs/changes/60/69360/6`
+  * `clone`: Download and store the repository in `./typo3-core`
 * `tdk:set-push-url`: Set Gerrit as remote to push patches to
-* `tdk:ddev-config`: Create a basic ddev configuration
-* `tdk:help`: Show summary with links to the TYPO3 Contribution Guide
-* `tdk:doctor`: Show potential issues
-* `typo3`: Shortcut to run TYPO3 Commands
-* `tdk:apply-patch`: Apply Gerrit patch e.g. `composer tdk:apply-patch -- --ref=refs/changes/75/72275/17` 
+* `tdk:ddev`: Create a basic ddev configuration
+* `tdk:composer <require|remove>`: Require or remove all TYPO3 Core extensions
+* `tdk:help <summary|done>`: Show informational text
+* `tdk:doctor`: Show potential issues 
 
 ## Demo run