Merge pull request #15 from monofony/add-meta

Add meta
monofony · Jan 9, 2025 · 827a95e · 827a95e
2 parents 77ec934 + 63c7e56
commit 827a95e
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 32 deletions.
diff --git a/.github/workflows/cqrs_pack.yml b/.github/workflows/cqrs_pack.yml
@@ -50,18 +50,12 @@ jobs:
                         ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-symfony-${{ matrix.symfony }}
 
-            -   name: "Validate composer.json"
-                run: (cd src/Cqrs && composer validate --no-check-version)
-
-            -   name: "Install dependencies"
-                run: (cd src/Cqrs && composer update --no-interaction --no-scripts)
-
             -   name: "Create test application"
                 run: |
                     git config --global user.email "[email protected]"
                     git config --global user.name "Your Name"
-                    (cd src/Cqrs && make create-test-application)
+                    (cd tests/Cqrs && make create-test-application)
                 id: end-of-setup
 
             -   name: "Run PHPUnit"
-                run: (cd src/Cqrs && vendor/bin/phpunit)
+                run: (cd tests/Cqrs/app && vendor/bin/phpunit)
diff --git a/.github/workflows/split_packages.yaml b/.github/workflows/split_packages.yaml
@@ -18,7 +18,7 @@ jobs:
             fail-fast: false
             matrix:
                 package:
-                    - { name: 'Cqrs', path: 'cqrs-pack' }
+                    - { path: 'pack/cqrs-pack', name: 'cqrs-pack' }
         steps:
             -   uses: actions/checkout@v3
                 with:
@@ -27,9 +27,9 @@ jobs:
             -   name: Split of ${{ matrix.package.name }}
                 uses: alphpaca/[email protected]
                 with:
-                    package_path: 'src/${{ matrix.package.name }}'
+                    package_path: 'src/${{ matrix.package.pack }}'
                     personal_access_token: ${{ secrets.MONOPLUS_PAT }}
                     git_username: 'loic425'
                     git_email: '[email protected]'
                     repository_owner: "monofony"
-                    repository_name: "${{ matrix.package.path }}"
+                    repository_name: "${{ matrix.package.name }}"
diff --git a/src/Cqrs/.gitattributes b/src/Cqrs/.gitattributes
diff --git a/src/Cqrs/.gitignore b/src/Cqrs/.gitignore
diff --git a/src/meta/cqrs-meta/composer.json b/src/meta/cqrs-meta/composer.json
@@ -0,0 +1,6 @@
+{
+    "name": "monofony/cqrs-meta",
+    "type": "metapackage",
+    "license": "MIT",
+    "description": "A meta package providing recipes for CQRS"
+}
diff --git a/src/Cqrs/composer.json → src/pack/cqrs-pack/composer.json b/src/Cqrs/composer.json → src/pack/cqrs-pack/composer.json
@@ -1,13 +1,10 @@
 {
     "name": "monofony/cqrs-pack",
     "description": "Pack for CQRS",
-    "type": "meta-package",
+    "type": "symfony-pack",
     "license": "MIT",
     "require": {
         "php": "^8.3",
         "symfony/messenger": "*"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^11.4"
     }
 }
diff --git a/tests/Cqrs/.gitignore b/tests/Cqrs/.gitignore
@@ -0,0 +1 @@
+app
diff --git a/...pplication/Command/CommandHandlerTest.php → ...pplication/Command/CommandHandlerTest.php b/...pplication/Command/CommandHandlerTest.php → ...pplication/Command/CommandHandlerTest.php
diff --git a/src/Cqrs/Makefile → tests/Cqrs/Makefile b/src/Cqrs/Makefile → tests/Cqrs/Makefile
@@ -1,26 +1,26 @@
 TEST_APP_BASENAME=app
-TEST_APP_DIR?=tests/${TEST_APP_BASENAME}
+TEST_APP_DIR?=${TEST_APP_BASENAME}
 
 .PHONY: create-test-application
 create-test-application: remove-test-application install-skeleton add-requirements copy-recipe copy-tests-resources
 
 .PHONY: remove-test-application
 remove-test-application:
-	(cd tests && rm -rf ${TEST_APP_BASENAME})
+	rm -rf ${TEST_APP_BASENAME}
 
 .PHONY: install-skeleton
 install-skeleton:
-	(cd tests && symfony new ${TEST_APP_BASENAME})
+	symfony new ${TEST_APP_BASENAME}
 
 .PHONY: add-requirements
 add-requirements:
-	(cd ${TEST_APP_DIR} && composer require symfony/messenger)
-	(cd ${TEST_APP_DIR} && composer require --dev phpunit/phpunit)
+	(cd ${TEST_APP_BASENAME} && composer require symfony/messenger)
+	(cd ${TEST_APP_BASENAME} && composer require --dev phpunit/phpunit)
 
 .PHONY: copy-recipe
 copy-recipe:
 	cp -R ./../../monofony/cqrs-pack/0.1/* ${TEST_APP_DIR}
 
 .PHONY: copy-tests-resources
 copy-tests-resources:
-	cp -R tests/Resources/* ${TEST_APP_DIR}
+	cp -R resources/* ${TEST_APP_DIR}
diff --git a/src/Cqrs/phpunit.xml.dist → tests/Cqrs/resources/phpunit.xml.dist b/src/Cqrs/phpunit.xml.dist → tests/Cqrs/resources/phpunit.xml.dist
@@ -5,7 +5,7 @@
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="tests/app/tests/bootstrap.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <ini name="display_errors" value="1" />
@@ -18,7 +18,7 @@
 
     <testsuites>
         <testsuite name="Integration Test Suite">
-            <directory>tests/Integration</directory>
+            <directory>../Integration</directory>
         </testsuite>
     </testsuites>
 

diff --git a/.../Book/Application/Command/BookCommand.php → .../Book/Application/Command/BookCommand.php b/.../Book/Application/Command/BookCommand.php → .../Book/Application/Command/BookCommand.php
diff --git a/...pplication/Command/BookCommandHandler.php → ...pplication/Command/BookCommandHandler.php b/...pplication/Command/BookCommandHandler.php → ...pplication/Command/BookCommandHandler.php