Merge pull request #451 from mpysiak/SYL-3914-refactor-directory-structure

[Maintenance] Refactor directory structure

Author: GSadee

src/Resources/assets/entrypoint.js assets/entrypoint.js

@@ -1,6 +1,6 @@
 imports:
-    - { resource: "@SyliusRefundPlugin/Resources/config/app/twig_hooks/**/*.yaml" }
-    - { resource: "@SyliusRefundPlugin/Resources/config/app/integrations.php" }
+    - { resource: "@SyliusRefundPlugin/config/app/twig_hooks/**/*.yaml" }
+    - { resource: "@SyliusRefundPlugin/config/app/integrations.php" }
 
 parameters:
     sylius_refund.credit_memo_save_path: "%kernel.project_dir%/private/credit_memos/"

src/Resources/assets/js/refund-button.js assets/js/refund-button.js

@@ -1,9 +1,9 @@
 sylius_refund_admin:
-    resource: "@SyliusRefundPlugin/Resources/config/admin_routing.yml"
+    resource: "@SyliusRefundPlugin/config/admin_routing.yml"
     prefix: '/%sylius_admin.path_name%'
 
 sylius_refund_shop:
-    resource: "@SyliusRefundPlugin/Resources/config/shop_routing.yml"
+    resource: "@SyliusRefundPlugin/config/shop_routing.yml"
     prefix: /{_locale}
     requirements:
         _locale: ^[a-z]{2}(?:_[A-Z]{2})?$

src/Resources/assets/sylius-logo.png assets/sylius-logo.png

@@ -21,7 +21,7 @@
     </imports>
 
     <parameters>
-        <parameter key="sylius_refund.default_logo_file">@SyliusRefundPlugin/Resources/assets/sylius-logo.png</parameter>
+        <parameter key="sylius_refund.default_logo_file">@SyliusRefundPlugin/assets/sylius-logo.png</parameter>
         <parameter key="sylius_refund.template.logo_file">%env(default:sylius_refund.default_logo_file:resolve:SYLIUS_REFUND_LOGO_FILE)%</parameter>
     </parameters>
 

src/Resources/config/admin_routing.yml config/admin_routing.yml

@@ -35,7 +35,7 @@ function let(
             $creditMemoRepository,
             $fileLocator,
             'creditMemoTemplate.html.twig',
-            '@SyliusRefundPlugin/Resources/assets/sylius-logo.png',
+            '@SyliusRefundPlugin/assets/sylius-logo.png',
             $twigToPdfGenerator,
             $creditMemoFileNameGenerator,
         );
@@ -59,7 +59,7 @@ function it_creates_credit_memo_pdf_with_generated_content_and_file_name_basing_
         $creditMemoFileNameGenerator->generateForPdf($creditMemo)->willReturn('2015_05_00004444.pdf');
 
         $fileLocator
-            ->locate('@SyliusRefundPlugin/Resources/assets/sylius-logo.png')
+            ->locate('@SyliusRefundPlugin/assets/sylius-logo.png')
             ->willReturn('located-path/sylius-logo.png');
 
         $twigToPdfGenerator

src/Resources/config/app/config.yml config/app/config.yml

@@ -38,7 +38,7 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $configs = $this->processConfiguration($configuration, $configs);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.xml');
 
         $this->tagsAutoconfiguration($container, [
@@ -70,7 +70,7 @@ protected function getMigrationsNamespace(): string
 
     protected function getMigrationsDirectory(): string
     {
-        return '@SyliusRefundPlugin/Migrations';
+        return '@SyliusRefundPlugin/src/Migrations';
     }
 
     /** @return string[] */

src/Resources/config/app/events.yaml config/app/events.yaml

@@ -19,4 +19,9 @@
 final class SyliusRefundPlugin extends Bundle
 {
     use SyliusPluginTrait;
+
+    public function getPath(): string
+    {
+        return \dirname(__DIR__);
+    }
 }

src/Resources/config/app/integrations.php config/app/integrations.php

@@ -1 +1 @@
-import '../../../../src/Resources/assets/entrypoint';
+import '../../../../assets/entrypoint';

src/Resources/config/app/twig_hooks/admin/credit_memo/show.yaml config/app/twig_hooks/admin/credit_memo/show.yaml

@@ -1,2 +1,2 @@
 imports:
-    - { resource: "@SyliusRefundPlugin/Resources/config/app/config.yml" }
+    - { resource: "@SyliusRefundPlugin/config/app/config.yml" }

src/Resources/config/app/twig_hooks/admin/order/refund/show.yaml config/app/twig_hooks/admin/order/refund/show.yaml

@@ -1,2 +1,2 @@
 sylius_refund:
-    resource: "@SyliusRefundPlugin/Resources/config/routing.yml"
+    resource: "@SyliusRefundPlugin/config/routing.yml"

src/Resources/config/app/twig_hooks/admin/order/show.yaml config/app/twig_hooks/admin/order/show.yaml

@@ -39,7 +39,7 @@ public function it_autoconfigures_prepending_doctrine_migration_with_proper_migr
             $doctrineMigrationsExtensionConfig[0]['migrations_paths']['Sylius\RefundPlugin\Migrations']
         ));
         self::assertSame(
-            '@SyliusRefundPlugin/Migrations',
+            '@SyliusRefundPlugin/src/Migrations',
             $doctrineMigrationsExtensionConfig[0]['migrations_paths']['Sylius\RefundPlugin\Migrations']
         );