Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Maintenance] Refactor directory structure #451

Merged
merged 1 commit into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
4 changes: 2 additions & 2 deletions src/Resources/config/app/config.yml → config/app/config.yml
Original file line number Diff line number Diff line change
@@ -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/"
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/Resources/config/routing.yml → config/routing.yml
Original file line number Diff line number Diff line change
@@ -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})?$
2 changes: 1 addition & 1 deletion src/Resources/config/services.xml → config/services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions spec/Generator/CreditMemoPdfFileGeneratorSpec.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function let(
$creditMemoRepository,
$fileLocator,
'creditMemoTemplate.html.twig',
'@SyliusRefundPlugin/Resources/assets/sylius-logo.png',
'@SyliusRefundPlugin/assets/sylius-logo.png',
$twigToPdfGenerator,
$creditMemoFileNameGenerator,
);
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/DependencyInjection/SyliusRefundExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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, [
Expand Down Expand Up @@ -70,7 +70,7 @@ protected function getMigrationsNamespace(): string

protected function getMigrationsDirectory(): string
{
return '@SyliusRefundPlugin/Migrations';
return '@SyliusRefundPlugin/src/Migrations';
}

/** @return string[] */
Expand Down
5 changes: 5 additions & 0 deletions src/SyliusRefundPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@
final class SyliusRefundPlugin extends Bundle
{
use SyliusPluginTrait;

public function getPath(): string
{
return \dirname(__DIR__);
}
}
2 changes: 1 addition & 1 deletion tests/Application/assets/admin/entry.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import '../../../../src/Resources/assets/entrypoint';
import '../../../../assets/entrypoint';
2 changes: 1 addition & 1 deletion tests/Application/config/packages/sylius_refund.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
imports:
- { resource: "@SyliusRefundPlugin/Resources/config/app/config.yml" }
- { resource: "@SyliusRefundPlugin/config/app/config.yml" }
2 changes: 1 addition & 1 deletion tests/Application/config/routes.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sylius_refund:
resource: "@SyliusRefundPlugin/Resources/config/routing.yml"
resource: "@SyliusRefundPlugin/config/routing.yml"
2 changes: 1 addition & 1 deletion tests/DependencyInjection/SyliusRefundExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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']
);

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.