chore(sf): rollback directory structure to avoid bc breaks keep it in…

…stead for a new major version
synolia · Jan 23, 2025 · a8c0f85 · a8c0f85
1 parent b75b9de
commit a8c0f85
Show file tree

Hide file tree

Showing 37 changed files with 18 additions and 22 deletions.
diff --git a/config/config.yaml b/config/config.yaml
diff --git a/config/routes/admin/attributes.yaml b/config/routes/admin/attributes.yaml
diff --git a/install/Application/config/packages/sylius_scheduler_command.yaml b/install/Application/config/packages/sylius_scheduler_command.yaml
@@ -1,2 +1,2 @@
 imports:
-    - { resource: "@SynoliaSyliusSchedulerCommandPlugin/config/config.yaml" }
+    - { resource: "@SynoliaSyliusSchedulerCommandPlugin/Resources/config/config.yaml" }
diff --git a/install/Application/config/routes/sylius_scheduler_command.yaml b/install/Application/config/routes/sylius_scheduler_command.yaml
@@ -1,3 +1,3 @@
 synolia_scheduled_command:
-    resource: "@SynoliaSyliusSchedulerCommandPlugin/config/routes/admin/**.yaml"
+    resource: "@SynoliaSyliusSchedulerCommandPlugin/Resources/config/admin_routing.yaml"
     prefix: '/%sylius_admin.path_name%'
diff --git a/src/DependencyInjection/SynoliaSyliusSchedulerCommandExtension.php b/src/DependencyInjection/SynoliaSyliusSchedulerCommandExtension.php
@@ -20,7 +20,7 @@ final class SynoliaSyliusSchedulerCommandExtension extends Extension implements
      */
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $loader = new YamlFileLoader($container, new FileLocator(\dirname(__DIR__, 2) . '/config'));
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yaml');
     }
 
@@ -39,7 +39,7 @@ protected function getMigrationsNamespace(): string
 
     protected function getMigrationsDirectory(): string
     {
-        return '@SynoliaSyliusSchedulerCommandPlugin/migrations';
+        return '@SynoliaSyliusSchedulerCommandPlugin/Migrations';
     }
 
     protected function getNamespacesOfMigrationsExecutedBefore(): array

diff --git a/migrations/Version20200107151826.php → src/Migrations/Version20200107151826.php b/migrations/Version20200107151826.php → src/Migrations/Version20200107151826.php
diff --git a/migrations/Version20210810054537.php → src/Migrations/Version20210810054537.php b/migrations/Version20210810054537.php → src/Migrations/Version20210810054537.php
diff --git a/migrations/Version20210828114655.php → src/Migrations/Version20210828114655.php b/migrations/Version20210828114655.php → src/Migrations/Version20210828114655.php
diff --git a/migrations/Version20211224090032.php → src/Migrations/Version20211224090032.php b/migrations/Version20211224090032.php → src/Migrations/Version20211224090032.php
diff --git a/config/routes/admin/routing.yaml → src/Resources/config/admin_routing.yaml b/config/routes/admin/routing.yaml → src/Resources/config/admin_routing.yaml
@@ -22,4 +22,10 @@ synolia_admin_scheduled_commands:
         vars:
             index:
                 icon: 'box'
-    type: sylius.resource
+    type: sylius.resource
+
+controllers:
+    resource:
+        path: ../../Controller/
+        namespace: Synolia\SyliusSchedulerCommandPlugin\Controller
+    type: attribute
diff --git a/src/Resources/config/config.yaml b/src/Resources/config/config.yaml
@@ -0,0 +1,5 @@
+imports:
+    - { resource: "@SynoliaSyliusSchedulerCommandPlugin/Resources/config/resources.yaml" }
+    - { resource: "@SynoliaSyliusSchedulerCommandPlugin/Resources/config/grids.yaml" }
+    - { resource: "@SynoliaSyliusSchedulerCommandPlugin/Resources/config/services.yaml" }
+    - { resource: "@SynoliaSyliusSchedulerCommandPlugin/Resources/config/ui.yaml" }
diff --git a/config/grids.yaml → src/Resources/config/grids.yaml b/config/grids.yaml → src/Resources/config/grids.yaml
diff --git a/config/resources.yaml → src/Resources/config/resources.yaml b/config/resources.yaml → src/Resources/config/resources.yaml
diff --git a/config/services.yaml → src/Resources/config/services.yaml b/config/services.yaml → src/Resources/config/services.yaml
@@ -9,5 +9,5 @@ services:
         autoconfigure: true
 
     Synolia\SyliusSchedulerCommandPlugin\:
-        resource: '../src/*'
-        exclude: '../src/{Entity,SynoliaSyliusSchedulerCommandPlugin.php}'
+        resource: '../../*'
+        exclude: '../../{Entity,SynoliaSyliusSchedulerCommandPlugin.php}'
diff --git a/config/ui.yaml → src/Resources/config/ui.yaml b/config/ui.yaml → src/Resources/config/ui.yaml
diff --git a/config/validation.yaml → src/Resources/config/validation.yaml b/config/validation.yaml → src/Resources/config/validation.yaml
diff --git a/public/column/index.js → src/Resources/public/column/index.js b/public/column/index.js → src/Resources/public/column/index.js
diff --git a/public/controller/index.css → src/Resources/public/controller/index.css b/public/controller/index.css → src/Resources/public/controller/index.css
diff --git a/public/controller/index.js → src/Resources/public/controller/index.js b/public/controller/index.js → src/Resources/public/controller/index.js
diff --git a/translations/messages.en.yml → src/Resources/translations/messages.en.yml b/translations/messages.en.yml → src/Resources/translations/messages.en.yml
diff --git a/translations/messages.fr.yml → src/Resources/translations/messages.fr.yml b/translations/messages.fr.yml → src/Resources/translations/messages.fr.yml
diff --git a/translations/messages.nl.yml → src/Resources/translations/messages.nl.yml b/translations/messages.nl.yml → src/Resources/translations/messages.nl.yml
diff --git a/translations/validators.en.yaml → ...Resources/translations/validators.en.yaml b/translations/validators.en.yaml → ...Resources/translations/validators.en.yaml
diff --git a/translations/validators.fr.yaml → ...Resources/translations/validators.fr.yaml b/translations/validators.fr.yaml → ...Resources/translations/validators.fr.yaml
diff --git a/templates/Controller/css.html.twig → src/Resources/views/Controller/css.html.twig b/templates/Controller/css.html.twig → src/Resources/views/Controller/css.html.twig
diff --git a/templates/Controller/js.html.twig → src/Resources/views/Controller/js.html.twig b/templates/Controller/js.html.twig → src/Resources/views/Controller/js.html.twig
diff --git a/templates/Controller/modal.html.twig → ...esources/views/Controller/modal.html.twig b/templates/Controller/modal.html.twig → ...esources/views/Controller/modal.html.twig
diff --git a/templates/Controller/show.html.twig → ...Resources/views/Controller/show.html.twig b/templates/Controller/show.html.twig → ...Resources/views/Controller/show.html.twig
diff --git a/...ates/Grid/Action/empty_log_file.html.twig → ...iews/Grid/Action/empty_log_file.html.twig b/...ates/Grid/Action/empty_log_file.html.twig → ...iews/Grid/Action/empty_log_file.html.twig
diff --git a/...tes/Grid/Action/empty_logs_file.html.twig → ...ews/Grid/Action/empty_logs_file.html.twig b/...tes/Grid/Action/empty_logs_file.html.twig → ...ews/Grid/Action/empty_logs_file.html.twig
diff --git a/...s/Grid/Action/execute_immediate.html.twig → ...s/Grid/Action/execute_immediate.html.twig b/...s/Grid/Action/execute_immediate.html.twig → ...s/Grid/Action/execute_immediate.html.twig
diff --git a/templates/Grid/Action/link.html.twig → ...esources/views/Grid/Action/link.html.twig b/templates/Grid/Action/link.html.twig → ...esources/views/Grid/Action/link.html.twig
diff --git a/...olumn/human_readable_expression.html.twig → ...olumn/human_readable_expression.html.twig b/...olumn/human_readable_expression.html.twig → ...olumn/human_readable_expression.html.twig
diff --git a/templates/Grid/Column/js.html.twig → src/Resources/views/Grid/Column/js.html.twig b/templates/Grid/Column/js.html.twig → src/Resources/views/Grid/Column/js.html.twig
diff --git a/templates/Grid/Column/log_file.html.twig → ...rces/views/Grid/Column/log_file.html.twig b/templates/Grid/Column/log_file.html.twig → ...rces/views/Grid/Column/log_file.html.twig
diff --git a/.../Column/scheduled_command_state.html.twig → .../Column/scheduled_command_state.html.twig b/.../Column/scheduled_command_state.html.twig → .../Column/scheduled_command_state.html.twig
diff --git a/src/SynoliaSyliusSchedulerCommandPlugin.php b/src/SynoliaSyliusSchedulerCommandPlugin.php
@@ -10,9 +10,4 @@
 final class SynoliaSyliusSchedulerCommandPlugin extends Bundle
 {
     use SyliusPluginTrait;
-
-    public function getPath(): string
-    {
-        return \dirname(__DIR__);
-    }
 }