Merge pull request #385 from loic425/feature/move-recipes-into-metapa…

…ckages

Move admin-pack recipes into admin metapackage

CHANGELOG-0.8.md

@@ -1,6 +1,12 @@
 ## Change Log
 
-### v0.8.0 (2022/01/03 17:24 +00:00)
+### v0.8.0-alpha.2 (2022/01/04 09:36 +00:00)
+- [#380](https://github.com/Monofony/Monofony/pull/380) Fix password reset template if front pack is not installed (@loic425)
+- [#383](https://github.com/Monofony/Monofony/pull/383) Fix return type hints on forms (@loic425)
+- [#382](https://github.com/Monofony/Monofony/pull/382) Remove grid yaml configuration (@loic425)
+- [#381](https://github.com/Monofony/Monofony/pull/381) Remove Symfony 5.3 support (@loic425)
+
+### v0.8.0-alpha.1 (2022/01/03 17:24 +00:00)
 - [#379](https://github.com/Monofony/Monofony/pull/379) Use Symfony style for commands (@loic425)
 - [#378](https://github.com/Monofony/Monofony/pull/378) Bump Symfony flex version from 1.17 to 2.0 (@loic425)
 - [#377](https://github.com/Monofony/Monofony/pull/377) Use Foundry for data fixtures (@loic425)

Makefile

@@ -32,7 +32,7 @@ validate-doctrine-schema:
 
 validate-twig:
 	bin/console lint:twig src/Monofony/Pack/CorePack/.recipe/templates
-	bin/console lint:twig src/Monofony/Pack/AdminPack/.recipe/templates
+	bin/console lint:twig src/Monofony/MetaPack/AdminMeta/.recipe/templates
 	bin/console lint:twig src/Monofony/Pack/FrontPack/.recipe/templates
 .PHONY: validate-twig
 
@@ -54,7 +54,7 @@ test-phpspec:
 
 test-phpstan:
 	vendor/bin/phpstan analyse -c phpstan.neon -l ${PHPSTAN_LEVEL} src/Monofony/Pack/CorePack/.recipe/src
-	vendor/bin/phpstan analyse -c phpstan.neon -l ${PHPSTAN_LEVEL} src/Monofony/Pack/AdminPack/.recipe/src
+	vendor/bin/phpstan analyse -c phpstan.neon -l ${PHPSTAN_LEVEL} src/Monofony/MetaPack/AdminMeta/.recipe/src
 	vendor/bin/phpstan analyse -c phpstan.neon -l ${PHPSTAN_LEVEL} src/Monofony/Pack/FrontPack/.recipe/src
 .PHONY: test-phpstan
 

behat.yml.dist

@@ -52,7 +52,7 @@ default:
         FriendsOfBehat\SuiteSettingsExtension:
             paths:
                 - "src/Monofony/Pack/CorePack/.recipe/features"
-                - "src/Monofony/Pack/AdminPack/.recipe/features"
+                - "src/Monofony/MetaPack/AdminMeta/.recipe/features"
                 - "src/Monofony/Pack/FrontPack/.recipe/features"
                 - "features"
 

bin/upgrade-to-0.4

@@ -186,6 +186,6 @@ function fixRecipes(Filesystem $filesystem, string $projectDir): void
 
     $filesystem->dumpFile(
         $projectDir.'/assets/backend/js/sylius-compound-form-errors.js',
-        file_get_contents('https://raw.githubusercontent.com/Monofony/Monofony/0.4/src/Monofony/Pack/AdminPack/.recipe/assets/backend/js/sylius-compound-form-errors.js')
+        file_get_contents('https://raw.githubusercontent.com/Monofony/Monofony/0.4/src/Monofony/MetaPack/AdminMeta/.recipe/assets/backend/js/sylius-compound-form-errors.js')
     );
 }

composer.json

@@ -17,15 +17,15 @@
             "App\\Collector\\": "src/Monofony/Pack/CorePack/.recipe/src/Collector/",
             "App\\Context\\": "src/Monofony/Pack/CorePack/.recipe/src/Context/",
             "App\\Command\\": "src/Monofony/Pack/CorePack/.recipe/src/Command/",
-            "App\\Dashboard\\": "src/Monofony/Pack/AdminPack/.recipe/src/Dashboard/",
+            "App\\Dashboard\\": "src/Monofony/MetaPack/AdminMeta/.recipe/src/Dashboard/",
             "App\\DataFixtures\\": "src/Monofony/Pack/CorePack/.recipe/src/DataFixtures/",
             "App\\DataTransformer\\": "src/Monofony/Pack/ApiPack/.recipe/src/DataTransformer/",
             "App\\Entity\\": "src/Monofony/Pack/CorePack/.recipe/src/Entity/",
             "App\\EventSubscriber\\": "src/Monofony/Pack/CorePack/.recipe/src/EventSubscriber/",
             "App\\Factory\\": "src/Monofony/Pack/CorePack/.recipe/src/Factory/",
             "App\\Fixture\\": "src/Monofony/Pack/CorePack/.recipe/src/Fixture/",
             "App\\Form\\": "src/Monofony/Pack/CorePack/.recipe/src/Form/",
-            "App\\Grid\\": "src/Monofony/Pack/AdminPack/.recipe/src/Grid/",
+            "App\\Grid\\": "src/Monofony/MetaPack/AdminMeta/.recipe/src/Grid/",
             "App\\Identifier\\": "src/Monofony/Pack/ApiPack/.recipe/src/Identifier/",
             "App\\Installer\\": "src/Monofony/Pack/CorePack/.recipe/src/Installer/",
             "App\\Installer\\Checker\\": "src/Monofony/Pack/CorePack/.recipe/src/Installer/Checker/",
@@ -45,18 +45,18 @@
             "App\\Tests\\Behat\\Context\\Setup\\": "src/Monofony/Pack/CorePack/.recipe/tests/Behat/Context/Setup/",
             "App\\Tests\\Behat\\Context\\Transform\\": "src/Monofony/Pack/CorePack/.recipe/tests/Behat/Context/Transform/",
             "App\\Tests\\Behat\\Context\\Ui\\": "src/Monofony/Pack/CorePack/.recipe/tests/Behat/Context/Ui/",
-            "App\\Tests\\Behat\\Context\\Ui\\Backend\\": "src/Monofony/Pack/AdminPack/.recipe/tests/Behat/Context/Ui/Backend/",
+            "App\\Tests\\Behat\\Context\\Ui\\Backend\\": "src/Monofony/MetaPack/AdminMeta/.recipe/tests/Behat/Context/Ui/Backend/",
             "App\\Tests\\Behat\\Context\\Ui\\Frontend\\": "src/Monofony/Pack/FrontPack/.recipe/tests/Behat/Context/Ui/Frontend/",
-            "App\\Tests\\Behat\\Element\\Backend\\": "src/Monofony/Pack/AdminPack/.recipe/tests/Behat/Element/Backend/",
-            "App\\Tests\\Behat\\Page\\Backend\\": "src/Monofony/Pack/AdminPack/.recipe/tests/Behat/Page/Backend/",
+            "App\\Tests\\Behat\\Element\\Backend\\": "src/Monofony/MetaPack/AdminMeta/.recipe/tests/Behat/Element/Backend/",
+            "App\\Tests\\Behat\\Page\\Backend\\": "src/Monofony/MetaPack/AdminMeta/.recipe/tests/Behat/Page/Backend/",
             "App\\Tests\\Behat\\Exception\\": "src/Monofony/Pack/CorePack/.recipe/tests/Behat/Exception/",
             "App\\Tests\\Behat\\Page\\Frontend\\": "src/Monofony/Pack/FrontPack/.recipe/tests/Behat/Page/Frontend/",
             "App\\Tests\\Behat\\Service\\": "src/Monofony/Pack/CorePack/.recipe/tests/Behat/Service/",
             "App\\Tests\\Controller\\": "src/Monofony/Pack/ApiPack/.recipe/tests/Controller/"
         },
         "classmap": [
-            "src/Monofony/Pack/AdminPack/.recipe/src/Controller/DashboardController.php",
-            "src/Monofony/Pack/AdminPack/.recipe/src/Menu/AdminMenuBuilder.php",
+            "src/Monofony/MetaPack/AdminMeta/.recipe/src/Controller/DashboardController.php",
+            "src/Monofony/MetaPack/AdminMeta/.recipe/src/Menu/AdminMenuBuilder.php",
             "src/Monofony/Pack/FrontPack/.recipe/src/Menu/AccountMenuBuilder.php",
             "src/Monofony/Pack/CorePack/.recipe/src/Command/Installer/InstallSampleDataCommand.php"
         ]

config/behat/suites.yaml

@@ -1,9 +1,9 @@
 imports:
     - ../../src/Monofony/Pack/CorePack/.recipe/config/behat/suites/cli/installer.yaml
 
-    - ../../src/Monofony/Pack/AdminPack/.recipe/config/behat/suites/ui/admin/dashboard.yaml
-    - ../../src/Monofony/Pack/AdminPack/.recipe/config/behat/suites/ui/customer/managing_customers.yaml
-    - ../../src/Monofony/Pack/AdminPack/.recipe/config/behat/suites/ui/user/managing_administrators.yaml
+    - ../../src/Monofony/MetaPack/AdminMeta/.recipe/config/behat/suites/ui/admin/dashboard.yaml
+    - ../../src/Monofony/MetaPack/AdminMeta/.recipe/config/behat/suites/ui/customer/managing_customers.yaml
+    - ../../src/Monofony/MetaPack/AdminMeta/.recipe/config/behat/suites/ui/user/managing_administrators.yaml
 
     - ../../src/Monofony/Pack/FrontPack/.recipe/config/behat/suites/ui/account/customer.yaml
     - ../../src/Monofony/Pack/FrontPack/.recipe/config/behat/suites/ui/account/login.yaml

config/packages/monofony_admin.yaml

@@ -1,2 +1,2 @@
 imports:
-    - { resource: '../../src/Monofony/Pack/AdminPack/.recipe/config/packages/monofony_admin.yaml' }
+    - { resource: '../../src/Monofony/MetaPack/AdminMeta/.recipe/config/packages/monofony_admin.yaml' }

config/packages/twig.yaml

@@ -7,5 +7,5 @@ twig:
     default_path:  '%kernel.project_dir%/src/Monofony/Pack/CorePack/.recipe/templates'
     paths:
         - '%kernel.project_dir%/src/Monofony/Pack/CorePack/.recipe/templates'
-        - '%kernel.project_dir%/src/Monofony/Pack/AdminPack/.recipe/templates'
+        - '%kernel.project_dir%/src/Monofony/MetaPack/AdminMeta/.recipe/templates'
         - '%kernel.project_dir%/src/Monofony/Pack/FrontPack/.recipe/templates'

config/routes.yaml

@@ -1,5 +1,5 @@
 app_backend:
-    resource: "../src/Monofony/Pack/AdminPack/.recipe/config/routes/backend.yaml"
+    resource: "../src/Monofony/MetaPack/AdminMeta/.recipe/config/routes/backend.yaml"
 
 app_frontend:
     resource: "../src/Monofony/Pack/FrontPack/.recipe/config/routes/frontend.yaml"

config/services/monofony_backend.yaml

@@ -9,12 +9,12 @@ services:
 
     app_backend:
         namespace: App\
-        resource: '../../src/Monofony/Pack/AdminPack/.recipe/src/*'
-        exclude: '../../src/Monofony/Pack/AdminPack/.recipe/src/{DependencyInjection,Entity,Form/EventSubscriber/AddUserFormSubscriber.php,Migrations,Tests,Kernel.php}'
+        resource: '../../src/Monofony/MetaPack/AdminMeta/.recipe/src/*'
+        exclude: '../../src/Monofony/MetaPack/AdminMeta/.recipe/src/{DependencyInjection,Entity,Form/EventSubscriber/AddUserFormSubscriber.php,Migrations,Tests,Kernel.php}'
 
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class
     controller_backend:
         namespace: App\Controller\
-        resource: '../../src/Monofony/Pack/AdminPack/.recipe/src/Controller'
+        resource: '../../src/Monofony/MetaPack/AdminMeta/.recipe/src/Controller'
         tags: ['controller.service_arguments']

config/services_test.yaml

@@ -17,7 +17,7 @@ services:
 
     app_tests_behat_admin:
         namespace: App\Tests\Behat\
-        resource: '../src/Monofony/Pack/AdminPack/.recipe/tests/Behat/*'
+        resource: '../src/Monofony/MetaPack/AdminMeta/.recipe/tests/Behat/*'
 
     app_tests_behat_front:
         namespace: App\Tests\Behat\

ecs-recipe.php

@@ -26,7 +26,7 @@
 
     $parameters = $containerConfigurator->parameters();
     $parameters->set(Option::PATHS, [
-        __DIR__.'/src/Monofony/Pack/AdminPack/.recipe',
+        __DIR__ . '/src/Monofony/MetaPack/AdminMeta/.recipe',
         __DIR__.'/src/Monofony/Pack/ApiPack/.recipe',
         __DIR__.'/src/Monofony/Pack/CorePack/.recipe',
         __DIR__.'/src/Monofony/Pack/FrontPack/.recipe',

phpspec.yml.dist

@@ -10,6 +10,6 @@ suites:
     Admin: { namespace: Monofony\Component\Admin, psr4_prefix: Monofony\Component\Admin, spec_path: src/Monofony/Component/Admin, src_path: src/Monofony/Component/Admin }
 
     # Packs
-    AdminPack.recipe: { spec_path: src/Monofony/Pack/AdminPack/.recipe, src_path: src/Monofony/Pack/AdminPack/.recipe }
+    AdminPack.recipe: { spec_path: src/Monofony/MetaPack/AdminMeta/.recipe, src_path: src/Monofony/MetaPack/AdminMeta/.recipe }
     ApiPack.recipe: { spec_path: src/Monofony/Pack/ApiPack/.recipe, src_path: src/Monofony/Pack/ApiPack/.recipe }
     CorePack.recipe: { spec_path: src/Monofony/Pack/CorePack/.recipe, src_path: src/Monofony/Pack/CorePack/.recipe }

psalm.xml

@@ -13,8 +13,8 @@
             <directory name="src/Monofony/Bridge/FOSOAuthServer/spec" />
             <directory name="src/Monofony/Bridge/FOSOAuthServer/spec" />
             <directory name="src/Monofony/Bridge/SyliusUser/spec" />
-            <directory name="src/Monofony/Pack/AdminPack/.recipe/spec" />
-            <directory name="src/Monofony/Pack/AdminPack/.recipe/tests" />
+            <directory name="src/Monofony/MetaPack/AdminMeta/.recipe/spec" />
+            <directory name="src/Monofony/MetaPack/AdminMeta/.recipe/tests" />
             <directory name="src/Monofony/Pack/CorePack/.recipe/spec" />
             <directory name="src/Monofony/Bundle/CoreBundle/spec" />
             <directory name="src/Monofony/Component/Admin/spec" />

rector.php

@@ -15,7 +15,7 @@
     $parameters = $containerConfigurator->parameters();
     $parameters->set(Option::PATHS, [
         __DIR__ . '/src/Monofony/Component/Admin',
-        __DIR__ . '/src/Monofony/Pack/AdminPack/.recipe/src',
+        __DIR__ . '/src/Monofony/MetaPack/AdminMeta/.recipe/src',
         __DIR__ . '/src/Monofony/Pack/ApiPack/.recipe/src',
         __DIR__ . '/src/Monofony/Pack/CorePack/.recipe/src',
         __DIR__ . '/src/Monofony/Pack/FrontPack/.recipe/src',

src/Monofony/Bundle/CoreBundle/MonofonyCoreBundle.php

@@ -23,7 +23,7 @@
 
 class MonofonyCoreBundle extends Bundle
 {
-    public const VERSION = '0.8.0';
+    public const VERSION = '0.8.0-alpha.2';
 
     /**
      * {@inheritdoc}

src/Monofony/MetaPack/AdminMeta/composer.json

@@ -0,0 +1,11 @@
+{
+    "name": "monofony/admin-meta",
+    "type": "metapackage",
+    "license": "MIT",
+    "description": "A meta package providing recipes for administration panel",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "0.8-dev"
+        }
+    }
+}

src/Monofony/Pack/AdminPack/composer.json

@@ -9,6 +9,7 @@
         "friends-of-behat/page-object-extension": "^0.3",
         "monofony/admin": "^0.8",
         "monofony/admin-contracts": "^0.8",
+        "monofony/admin-meta": "^0.8",
         "monofony/behat-bridge": "^0.8",
         "monofony/core-contracts": "^0.8",
         "monofony/ui-bundle": "^1.10",
@@ -30,12 +31,12 @@
     },
     "autoload": {
         "exclude-from-classmap": [
-            "/.recipe/"
+            "/Monofony/MetaPack/.recipe/"
         ]
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\": ".recipe/src"
+            "App\\": "../../MetaPack/AdminMeta/.recipe/src"
         }
     },
     "config": {

src/Monofony/Pack/AdminPack/phpstan.neon

@@ -1,8 +1,8 @@
 parameters:
     paths:
-        - .recipe
+        - ../../MetaPack/AdminMeta/.recipe
     excludePaths:
         - 'vendor/**.php'
         - '**/spec/**.php'
-        - .recipe/src/Dashboard/Statistics/CustomerStatistic.php
-        - .recipe/src/Grid/**.php
+        - '../../MetaPack/AdminMeta/.recipe/src/Dashboard/Statistics/CustomerStatistic.php'
+        - '../../MetaPack/AdminMeta/.recipe/src/Grid/**.php'

webpack.config.js

@@ -2,7 +2,7 @@ const path = require('path');
 const vendorUiPath = path.resolve(__dirname, 'vendor/monofony/ui-bundle');
 const build = require('./src/Monofony/Pack/CorePack/.recipe/config-builder');
 
-const backendConfig = build('backend', `./src/Monofony/Pack/AdminPack/.recipe/assets/backend/`, vendorUiPath);
+const backendConfig = build('backend', `./src/Monofony/MetaPack/AdminMeta/.recipe/assets/backend/`, vendorUiPath);
 const frontendConfig = build('frontend', `./src/Monofony/Pack/FrontPack/.recipe/assets/frontend/`, vendorUiPath);
 
 module.exports = [backendConfig, frontendConfig];