Reorganize directory structure

Sylius · Nov 20, 2024 · f47bdb6 · f47bdb6
1 parent dfd08cd
commit f47bdb6
Show file tree

Hide file tree

Showing 56 changed files with 18 additions and 13 deletions.
diff --git a/src/Resources/assets/sylius-logo.png → assets/sylius-logo.png b/src/Resources/assets/sylius-logo.png → assets/sylius-logo.png
diff --git a/...es/config/app/routing/admin_invoicing.yml → config/admin_routes.yaml b/...es/config/app/routing/admin_invoicing.yml → config/admin_routes.yaml
diff --git a/src/Resources/config/config.yml → config/config.yaml b/src/Resources/config/config.yml → config/config.yaml
diff --git a/...urces/config/doctrine/BillingData.orm.xml → config/doctrine/BillingData.orm.xml b/...urces/config/doctrine/BillingData.orm.xml → config/doctrine/BillingData.orm.xml
diff --git a/...Resources/config/doctrine/Invoice.orm.xml → config/doctrine/Invoice.orm.xml b/...Resources/config/doctrine/Invoice.orm.xml → config/doctrine/Invoice.orm.xml
diff --git a/...s/config/doctrine/InvoiceSequence.orm.xml → config/doctrine/InvoiceSequence.orm.xml b/...s/config/doctrine/InvoiceSequence.orm.xml → config/doctrine/InvoiceSequence.orm.xml
diff --git a/...g/doctrine/InvoiceShopBillingData.orm.xml → ...g/doctrine/InvoiceShopBillingData.orm.xml b/...g/doctrine/InvoiceShopBillingData.orm.xml → ...g/doctrine/InvoiceShopBillingData.orm.xml
diff --git a/...esources/config/doctrine/LineItem.orm.xml → config/doctrine/LineItem.orm.xml b/...esources/config/doctrine/LineItem.orm.xml → config/doctrine/LineItem.orm.xml
diff --git a/...Resources/config/doctrine/TaxItem.orm.xml → config/doctrine/TaxItem.orm.xml b/...Resources/config/doctrine/TaxItem.orm.xml → config/doctrine/TaxItem.orm.xml
diff --git a/src/Resources/config/services.xml → config/services.xml b/src/Resources/config/services.xml → config/services.xml
@@ -6,7 +6,7 @@
     </imports>
 
     <parameters>
-        <parameter key="default_logo_file">@SyliusInvoicingPlugin/Resources/assets/sylius-logo.png</parameter>
+        <parameter key="default_logo_file">@SyliusInvoicingPlugin/assets/sylius-logo.png</parameter>
         <parameter key="sylius.invoicing.template.logo_file">%env(default:default_logo_file:resolve:SYLIUS_INVOICING_LOGO_FILE)%</parameter>
     </parameters>
 

diff --git a/src/Resources/config/services/actions.xml → config/services/actions.xml b/src/Resources/config/services/actions.xml → config/services/actions.xml
diff --git a/src/Resources/config/services/cli.xml → config/services/cli.xml b/src/Resources/config/services/cli.xml → config/services/cli.xml
diff --git a/src/Resources/config/services/converters.xml → config/services/converters.xml b/src/Resources/config/services/converters.xml → config/services/converters.xml
diff --git a/src/Resources/config/services/fixtures.xml → config/services/fixtures.xml b/src/Resources/config/services/fixtures.xml → config/services/fixtures.xml
diff --git a/src/Resources/config/services/generators.xml → config/services/generators.xml b/src/Resources/config/services/generators.xml → config/services/generators.xml
diff --git a/src/Resources/config/services/listeners.xml → config/services/listeners.xml b/src/Resources/config/services/listeners.xml → config/services/listeners.xml
diff --git a/...es/config/services/listeners/workflow.xml → config/services/listeners/workflow.xml b/...es/config/services/listeners/workflow.xml → config/services/listeners/workflow.xml
diff --git a/src/Resources/config/services/ui.xml → config/services/ui.xml b/src/Resources/config/services/ui.xml → config/services/ui.xml
diff --git a/...ces/config/app/routing/shop_invoicing.yml → config/shop_routes.yaml b/...ces/config/app/routing/shop_invoicing.yml → config/shop_routes.yaml
diff --git a/src/Resources/config/validation.xml → config/validation.xml b/src/Resources/config/validation.xml → config/validation.xml
diff --git a/docs/legacy_installation.md b/docs/legacy_installation.md
@@ -19,18 +19,18 @@
 
     ```yaml
     imports:
-        - { resource: "@SyliusInvoicingPlugin/Resources/config/config.yml" }
+        - { resource: '@SyliusInvoicingPlugin/config/config.yaml' }
     ```
 
 1. Import routing:
 
     ```yaml
     sylius_invoicing_plugin_admin:
-        resource: "@SyliusInvoicingPlugin/Resources/config/app/routing/admin_invoicing.yml"
-        prefix: /admin
+        resource: '@SyliusInvoicingPlugin/config/admin_routes.yaml'
+        prefix: '/%sylius_admin.path_name%'
     
     sylius_invoicing_plugin_shop:
-        resource: "@SyliusInvoicingPlugin/Resources/config/app/routing/shop_invoicing.yml"
+        resource: '@SyliusInvoicingPlugin/config/shop_routes.yml'
         prefix: /{_locale}
         requirements:
             _locale: ^[a-z]{2}(?:_[A-Z]{2})?$

diff --git a/spec/Generator/InvoicePdfFileGeneratorSpec.php b/spec/Generator/InvoicePdfFileGeneratorSpec.php
@@ -34,7 +34,7 @@ function let(
             $fileLocator,
             $invoiceFileNameGenerator,
             'invoiceTemplate.html.twig',
-            '@SyliusInvoicingPlugin/Resources/assets/sylius-logo.png',
+            '@SyliusInvoicingPlugin/assets/sylius-logo.png',
         );
     }
 
@@ -53,7 +53,7 @@ function it_creates_invoice_pdf_with_generated_content_and_filename_basing_on_in
         $invoiceFileNameGenerator->generateForPdf($invoice)->willReturn('2015_05_00004444.pdf');
         $invoice->channel()->willReturn($channel);
 
-        $fileLocator->locate('@SyliusInvoicingPlugin/Resources/assets/sylius-logo.png')->willReturn('located-path/sylius-logo.png');
+        $fileLocator->locate('@SyliusInvoicingPlugin/assets/sylius-logo.png')->willReturn('located-path/sylius-logo.png');
 
         $twigToPdfGenerator
             ->generate('invoiceTemplate.html.twig', ['invoice' => $invoice, 'channel' => $channel, 'invoiceLogoPath' => 'located-path/sylius-logo.png'])

diff --git a/src/DependencyInjection/SyliusInvoicingExtension.php b/src/DependencyInjection/SyliusInvoicingExtension.php
@@ -27,7 +27,7 @@ final class SyliusInvoicingExtension extends AbstractResourceExtension implement
 
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.xml');
 
         /** @var ConfigurationInterface $configuration */
@@ -55,7 +55,7 @@ protected function getMigrationsNamespace(): string
 
     protected function getMigrationsDirectory(): string
     {
-        return '@SyliusInvoicingPlugin/Migrations';
+        return '@SyliusInvoicingPlugin/src/Migrations';
     }
 
     protected function getNamespacesOfMigrationsExecutedBefore(): array

diff --git a/src/SyliusInvoicingPlugin.php b/src/SyliusInvoicingPlugin.php
@@ -29,4 +29,9 @@ public function build(ContainerBuilder $container): void
 
         $container->addCompilerPass(new SymfonyClockCompilerPass());
     }
+
+    public function getPath(): string
+    {
+        return \dirname(__DIR__);
+    }
 }
diff --git a/...urces/views/Grid/Filter/channel.html.twig → templates/Grid/Filter/channel.html.twig b/...urces/views/Grid/Filter/channel.html.twig → templates/Grid/Filter/channel.html.twig
diff --git a/...s/Invoice/Admin/_downloadButton.html.twig → ...s/Invoice/Admin/_downloadButton.html.twig b/...s/Invoice/Admin/_downloadButton.html.twig → ...s/Invoice/Admin/_downloadButton.html.twig
diff --git a/...ews/Invoice/Admin/_resendButton.html.twig → ...tes/Invoice/Admin/_resendButton.html.twig b/...ews/Invoice/Admin/_resendButton.html.twig → ...tes/Invoice/Admin/_resendButton.html.twig
diff --git a/...rces/views/Invoice/Download/pdf.html.twig → templates/Invoice/Download/pdf.html.twig b/...rces/views/Invoice/Download/pdf.html.twig → templates/Invoice/Download/pdf.html.twig
diff --git a/...iews/Invoice/Download/pdfLayout.html.twig → ...ates/Invoice/Download/pdfLayout.html.twig b/...iews/Invoice/Download/pdfLayout.html.twig → ...ates/Invoice/Download/pdfLayout.html.twig
diff --git a/.../Invoice/Email/invoiceGenerated.html.twig → .../Invoice/Email/invoiceGenerated.html.twig b/.../Invoice/Email/invoiceGenerated.html.twig → .../Invoice/Email/invoiceGenerated.html.twig
diff --git a/...iews/Invoice/Grid/Field/channel.html.twig → ...ates/Invoice/Grid/Field/channel.html.twig b/...iews/Invoice/Grid/Field/channel.html.twig → ...ates/Invoice/Grid/Field/channel.html.twig
diff --git a/.../Invoice/Grid/Field/orderNumber.html.twig → .../Invoice/Grid/Field/orderNumber.html.twig b/.../Invoice/Grid/Field/orderNumber.html.twig → .../Invoice/Grid/Field/orderNumber.html.twig
diff --git a/.../views/Invoice/Show/_backButton.html.twig → templates/Invoice/Show/_backButton.html.twig b/.../views/Invoice/Show/_backButton.html.twig → templates/Invoice/Show/_backButton.html.twig
diff --git a/...views/Invoice/Show/_billingData.html.twig → ...lates/Invoice/Show/_billingData.html.twig b/...views/Invoice/Show/_billingData.html.twig → ...lates/Invoice/Show/_billingData.html.twig
diff --git a/.../views/Invoice/Show/_breadcrumb.html.twig → templates/Invoice/Show/_breadcrumb.html.twig b/.../views/Invoice/Show/_breadcrumb.html.twig → templates/Invoice/Show/_breadcrumb.html.twig
diff --git a/...rces/views/Invoice/Show/_header.html.twig → templates/Invoice/Show/_header.html.twig b/...rces/views/Invoice/Show/_header.html.twig → templates/Invoice/Show/_header.html.twig
diff --git a/...s/Invoice/Show/_shopBillingData.html.twig → ...s/Invoice/Show/_shopBillingData.html.twig b/...s/Invoice/Show/_shopBillingData.html.twig → ...s/Invoice/Show/_shopBillingData.html.twig
diff --git a/src/Resources/views/Invoice/show.html.twig → templates/Invoice/show.html.twig b/src/Resources/views/Invoice/show.html.twig → templates/Invoice/show.html.twig
diff --git a/...ces/views/Order/Admin/_invoices.html.twig → templates/Order/Admin/_invoices.html.twig b/...ces/views/Order/Admin/_invoices.html.twig → templates/Order/Admin/_invoices.html.twig
diff --git a/...views/Order/Admin/fetchInvoices.html.twig → ...lates/Order/Admin/fetchInvoices.html.twig b/...views/Order/Admin/fetchInvoices.html.twig → ...lates/Order/Admin/fetchInvoices.html.twig
diff --git a/...iews/Order/Shop/_downloadButton.html.twig → ...ates/Order/Shop/_downloadButton.html.twig b/...iews/Order/Shop/_downloadButton.html.twig → ...ates/Order/Shop/_downloadButton.html.twig
diff --git a/...rces/views/Order/Shop/_invoices.html.twig → templates/Order/Shop/_invoices.html.twig b/...rces/views/Order/Shop/_invoices.html.twig → templates/Order/Shop/_invoices.html.twig
diff --git a/.../views/Order/Shop/fetchInvoices.html.twig → templates/Order/Shop/fetchInvoices.html.twig b/.../views/Order/Shop/fetchInvoices.html.twig → templates/Order/Shop/fetchInvoices.html.twig
diff --git a/tests/Application/config/packages/_sylius.yaml b/tests/Application/config/packages/_sylius.yaml
@@ -5,7 +5,7 @@ imports:
 
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
 
-    - { resource: "@SyliusInvoicingPlugin/Resources/config/config.yml" }
+    - { resource: "@SyliusInvoicingPlugin/config/config.yaml" }
 
     - { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" }
 parameters:

diff --git a/tests/Application/config/packages/sylius_invoicing.yaml b/tests/Application/config/packages/sylius_invoicing.yaml
@@ -1,2 +1,2 @@
 imports:
-    - { resource: "@SyliusInvoicingPlugin/Resources/config/config.yml" }
+    - { resource: "@SyliusInvoicingPlugin/config/config.yaml" }
diff --git a/tests/Application/config/routes/sylius_invoicing_plugin.yaml b/tests/Application/config/routes/sylius_invoicing_plugin.yaml
@@ -1,9 +1,9 @@
 sylius_invoicing_plugin_admin:
-    resource: "@SyliusInvoicingPlugin/Resources/config/app/routing/admin_invoicing.yml"
+    resource: "@SyliusInvoicingPlugin/config/admin_routes.yaml"
     prefix: /admin
 
 sylius_invoicing_plugin_shop:
-    resource: "@SyliusInvoicingPlugin/Resources/config/app/routing/shop_invoicing.yml"
+    resource: "@SyliusInvoicingPlugin/config/shop_routes.yaml"
     prefix: /{_locale}
     requirements:
         _locale: ^[a-z]{2}(?:_[A-Z]{2})?$
diff --git a/src/Resources/translations/flashes.de.yml → translations/flashes.de.yml b/src/Resources/translations/flashes.de.yml → translations/flashes.de.yml
diff --git a/src/Resources/translations/flashes.en.yml → translations/flashes.en.yml b/src/Resources/translations/flashes.en.yml → translations/flashes.en.yml
diff --git a/src/Resources/translations/flashes.pl.yml → translations/flashes.pl.yml b/src/Resources/translations/flashes.pl.yml → translations/flashes.pl.yml
diff --git a/src/Resources/translations/messages.de.yml → translations/messages.de.yml b/src/Resources/translations/messages.de.yml → translations/messages.de.yml
diff --git a/src/Resources/translations/messages.en.yml → translations/messages.en.yml b/src/Resources/translations/messages.en.yml → translations/messages.en.yml
diff --git a/src/Resources/translations/messages.fr.yml → translations/messages.fr.yml b/src/Resources/translations/messages.fr.yml → translations/messages.fr.yml
diff --git a/src/Resources/translations/messages.pl.yml → translations/messages.pl.yml b/src/Resources/translations/messages.pl.yml → translations/messages.pl.yml
diff --git a/src/Resources/translations/validators.de.yml → translations/validators.de.yml b/src/Resources/translations/validators.de.yml → translations/validators.de.yml
diff --git a/src/Resources/translations/validators.en.yml → translations/validators.en.yml b/src/Resources/translations/validators.en.yml → translations/validators.en.yml
diff --git a/src/Resources/translations/validators.pl.yml → translations/validators.pl.yml b/src/Resources/translations/validators.pl.yml → translations/validators.pl.yml