feat: Added all roadiz/* sub packages to lib/ folder in order to crea…

…te monorepo
roadiz · Feb 10, 2023 · 854c74d · 854c74d
1 parent 43b703d
commit 854c74d
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -140,14 +140,21 @@ fabric.properties
 /.data/db_test/*
 /.data/pgsql_test/*
 /.data/solr/*
-/lib/RoadizCoreBundle
+/lib/DocGenerator
+/lib/Documents
+/lib/DtsGenerator
+/lib/EntityGenerator
+/lib/Jwt
+/lib/Markdown
+/lib/Models
+/lib/OpenId
+/lib/Random
 /lib/RoadizCompatBundle
+/lib/RoadizCoreBundle
+/lib/RoadizFontBundle
 /lib/RoadizRozierBundle
 /lib/RoadizUserBundle
-/lib/RoadizFontBundle
 /lib/Rozier
-/lib/Models
-/lib/Documents
 /themes/BaseTheme
 /public/themes/BaseTheme
 /public/assets/*

diff --git a/Makefile b/Makefile
@@ -1,15 +1,23 @@
 
 test:
 	vendor/bin/atoum -d ./lib/Documents/tests
+	vendor/bin/atoum -f ./lib/EntityGenerator/tests/units/*
 	#php -d "memory_limit=-1" vendor/bin/phpcs --report=full --report-file=./report.txt -p ./src
-	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizCoreBundle/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/DocGenerator/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Documents/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/DtsGenerator/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/EntityGenerator/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Jwt/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Markdown/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Models/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/OpenId/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Random/src
 	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizCompatBundle/src
-	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizRozierBundle/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizCoreBundle/src
 	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizFontBundle/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizRozierBundle/src
 	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizUserBundle/src
 	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Rozier/src
-	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Models/src
-	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Documents/src
 	php -d "memory_limit=-1" vendor/bin/phpstan analyse -c phpstan.neon
 	php -d "memory_limit=-1" bin/console lint:twig ./lib/Rozier/src/Resources/views
 	php -d "memory_limit=-1" bin/console lint:twig ./lib/Documents/src/Resources/views

diff --git a/README.md b/README.md
@@ -1,18 +1,25 @@
 # Roadiz CoreBundle development app
 
-This is development app for Roadiz v2.x. It aggregates all Roadiz bundle and main repositories in one place.
+This is development app for Roadiz v2. It aggregates all Roadiz bundle and main repositories in one place.
 
 ### Install
 
 - Clone this repository
-- Clone roadiz/core-bundle in `lib/RoadizCoreBundle` directory
 - Clone roadiz/compat-bundle in `lib/RoadizCompatBundle` directory
-- Clone roadiz/rozier-bundle in `lib/RoadizRozierBundle` directory
-- Clone roadiz/user-bundle in `lib/RoadizUserBundle` directory
+- Clone roadiz/core-bundle in `lib/RoadizCoreBundle` directory
+- Clone roadiz/doc-generator in `lib/DocGenerator` directory
+- Clone roadiz/documents in `lib/Documents` directory
+- Clone roadiz/dts-generator in `lib/DtsGenerator` directory
+- Clone roadiz/entity-generator in `lib/EntityGenerator` directory
 - Clone roadiz/font-bundle in `lib/RoadizFontBundle` directory
-- Clone roadiz/rozier in `lib/Rozier` directory
+- Clone roadiz/jwt in `lib/Jwt` directory
+- Clone roadiz/markdown in `lib/Markdown` directory
 - Clone roadiz/models in `lib/Models` directory
-- Clone roadiz/documents in `lib/Documents` directory
+- Clone roadiz/openid in `lib/OpenId` directory
+- Clone roadiz/random in `lib/Random` directory
+- Clone roadiz/rozier in `lib/Rozier` directory
+- Clone roadiz/rozier-bundle in `lib/RoadizRozierBundle` directory
+- Clone roadiz/user-bundle in `lib/RoadizUserBundle` directory
 
 ### Generate JWT private and public keys
 
@@ -47,3 +54,8 @@ make test
 ```
 
 Note that _phpstan_ can issue wrong errors if your `lib/*` bundles are symlinked.
+
+### Monorepo tools
+
+- `vendor/bin/monorepo-builder merge`: Makes sure all your packages deps are in development repository and 
+- `vendor/bin/monorepo-builder validate`: Make sure all your packages use the same version
diff --git a/composer.json b/composer.json
@@ -1,4 +1,6 @@
 {
+    "name": "roadiz/dev",
+    "description": "Roadiz Development monorepo and application",
     "license": "proprietary",
     "authors": [
         {
@@ -32,8 +34,10 @@
         "ext-simplexml": "*",
         "ext-zip": "*",
         "api-platform/core": "~2.7.0",
+        "codercat/jwk-to-pem": "^1.0",
         "composer/package-versions-deprecated": "1.11.99.3",
         "doctrine/annotations": "^1.0",
+        "doctrine/collections": ">=1.6",
         "doctrine/doctrine-bundle": "^2.3",
         "doctrine/doctrine-migrations-bundle": "^3.1",
         "doctrine/migrations": "^3.1.1",
@@ -47,6 +51,8 @@
         "james-heinrich/getid3": "^1.9",
         "jms/serializer": "^3.9.0",
         "jms/serializer-bundle": "^3.10.0",
+        "lcobucci/jwt": "^4.1",
+        "league/commonmark": "^2.2.0",
         "league/flysystem": "^3.0",
         "league/flysystem-bundle": "^3.0",
         "lexik/jwt-authentication-bundle": "^2.13",
@@ -55,20 +61,22 @@
         "phpdocumentor/reflection-docblock": "^5.2",
         "phpoffice/phpspreadsheet": "^1.15",
         "pimple/pimple": "^3.3.1",
+        "psr/cache": ">=1.0.1",
+        "psr/log": ">=1.1",
         "rezozero/crypto": "^1.0.0",
         "rezozero/intervention-request-bundle": "~3.0.0 || dev-develop",
         "rezozero/liform-bundle": "^0.18.1",
         "rezozero/tree-walker": "^1.3.0",
         "roadiz/compat-bundle": "~2.1.0 || dev-develop",
         "roadiz/core-bundle": "~2.1.0 || dev-develop",
-        "roadiz/doc-generator": "~2.0.0",
-        "roadiz/dts-generator": "~2.0.0",
+        "roadiz/doc-generator": "~2.1.0 || dev-develop",
+        "roadiz/dts-generator": "~2.1.0 || dev-develop",
         "roadiz/entity-generator": "~2.1.0 || dev-develop",
-        "roadiz/jwt": "~2.0.0",
-        "roadiz/markdown": "~2.0.0",
+        "roadiz/jwt": "~2.1.0 || dev-develop",
+        "roadiz/markdown": "~2.1.0 || dev-develop",
         "roadiz/nodetype-contracts": "~1.1.2",
-        "roadiz/openid": "~2.0.0",
-        "roadiz/random": "~2.0.0",
+        "roadiz/openid": "~2.1.0 || dev-develop",
+        "roadiz/random": "~2.1.0 || dev-develop",
         "roadiz/rozier-bundle": "~2.1.0 || dev-develop",
         "roadiz/user-bundle": "~2.1.0 || dev-develop",
         "rollerworks/password-common-list": "^0.2.0",
@@ -84,6 +92,7 @@
         "symfony/console": "5.4.*",
         "symfony/dotenv": "5.4.*",
         "symfony/event-dispatcher": "5.4.*",
+        "symfony/event-dispatcher-contracts": "^1.1.9 || ^2.4.0",
         "symfony/expression-language": "5.4.*",
         "symfony/filesystem": "5.4.*",
         "symfony/finder": "5.4.*",
@@ -176,13 +185,21 @@
             "RZ\\Roadiz\\CompatBundle\\": "lib/RoadizCompatBundle/src/",
             "RZ\\Roadiz\\CoreBundle\\": "lib/RoadizCoreBundle/src/",
             "RZ\\Roadiz\\Core\\": "lib/Models/src/Roadiz/Core/",
+            "RZ\\Roadiz\\Documentation\\": "lib/DocGenerator/src/",
             "RZ\\Roadiz\\Documents\\": "lib/Documents/src/",
+            "RZ\\Roadiz\\EntityGenerator\\": "lib/EntityGenerator/src/",
             "RZ\\Roadiz\\FontBundle\\": "lib/RoadizFontBundle/src/",
+            "RZ\\Roadiz\\JWT\\": "lib/Jwt/src/",
+            "RZ\\Roadiz\\Markdown\\": "lib/Markdown/src/",
+            "RZ\\Roadiz\\OpenId\\": "lib/OpenId/src/",
+            "RZ\\Roadiz\\Random\\": "lib/Random/src/",
             "RZ\\Roadiz\\RozierBundle\\": "lib/RoadizRozierBundle/src/",
+            "RZ\\Roadiz\\Typescript\\Declaration\\": "lib/DtsGenerator/src/",
             "RZ\\Roadiz\\UserBundle\\": "lib/RoadizUserBundle/src/",
             "RZ\\Roadiz\\Utils\\": "lib/Models/src/Roadiz/Utils/",
             "Themes\\": "themes/",
-            "Themes\\Rozier\\": "lib/Rozier/src/"
+            "Themes\\Rozier\\": "lib/Rozier/src/",
+            "tests\\mocks\\": "lib/EntityGenerator/tests/mocks/"
         }
     },
     "autoload-dev": {
@@ -193,9 +210,16 @@
     "replace": {
         "roadiz/compat-bundle": "*",
         "roadiz/core-bundle": "*",
+        "roadiz/doc-generator": "*",
         "roadiz/documents": "*",
+        "roadiz/dts-generator": "*",
+        "roadiz/entity-generator": "*",
         "roadiz/font-bundle": "*",
+        "roadiz/jwt": "*",
+        "roadiz/markdown": "*",
         "roadiz/models": "*",
+        "roadiz/openid": "*",
+        "roadiz/random": "*",
         "roadiz/roadiz": "*",
         "roadiz/rozier": "*",
         "roadiz/rozier-bundle": "*",
@@ -224,6 +248,9 @@
         "symfony": {
             "allow-contrib": false,
             "require": "5.4.*"
+        },
+        "branch-alias": {
+            "dev-main": "2.1-dev"
         }
     },
     "minimum-stability": "dev",

diff --git a/monorepo-builder.php b/monorepo-builder.php
@@ -3,10 +3,23 @@
 declare(strict_types=1);
 
 use Symplify\MonorepoBuilder\Config\MBConfig;
+use Symplify\MonorepoBuilder\Release\ReleaseWorker\SetCurrentMutualDependenciesReleaseWorker;
+use Symplify\MonorepoBuilder\Release\ReleaseWorker\SetNextMutualDependenciesReleaseWorker;
+use Symplify\MonorepoBuilder\Release\ReleaseWorker\UpdateBranchAliasReleaseWorker;
+use Symplify\MonorepoBuilder\Release\ReleaseWorker\UpdateReplaceReleaseWorker;
 
 return static function (MBConfig $mbConfig): void {
     $mbConfig->packageDirectories([__DIR__ . '/lib']);
     $mbConfig->packageDirectoriesExcludes([
         __DIR__ . '/lib/Rozier/src',
     ]);
+
+    $mbConfig->defaultBranch('develop');
+
+    $mbConfig->workers([
+        UpdateReplaceReleaseWorker::class,
+        SetCurrentMutualDependenciesReleaseWorker::class,
+        SetNextMutualDependenciesReleaseWorker::class,
+        UpdateBranchAliasReleaseWorker::class,
+    ]);
 };
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,15 +1,22 @@
 parameters:
     level: 6
     paths:
-        - src
-        - lib/RoadizCoreBundle/src
+        - lib/DocGenerator/src
+        - lib/Documents/src
+        - lib/DtsGenerator/src
+        - lib/EntityGenerator/src
+        - lib/Jwt/src
+        - lib/Markdown/src
+        - lib/Models/src
+        - lib/OpenId/src
+        - lib/Random/src
         - lib/RoadizCompatBundle/src
-        - lib/RoadizRozierBundle/src
+        - lib/RoadizCoreBundle/src
         - lib/RoadizFontBundle/src
+        - lib/RoadizRozierBundle/src
         - lib/RoadizUserBundle/src
-        - lib/Models/src
-        - lib/Documents/src
         - lib/Rozier/src
+        - src
     bootstrapFiles:
         - lib/RoadizCompatBundle/deprecated.php
     excludePaths: