Merge branch '1.0'

* 1.0: Simplify tests [Translations] Updated translations from Crowdin [Documentation] Update plugin name [Documenation] Update plugin mapping recommendation
Sylius · Dec 18, 2017 · 6473141 · 6473141
2 parents e31c742 + d645651
commit 6473141
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 68 deletions.
diff --git a/docs/plugins/creating-plugin.rst b/docs/plugins/creating-plugin.rst
@@ -105,7 +105,7 @@ Assuming you are creating the invoicing plugin as used above, this will result i
     use Sylius\Bundle\CoreBundle\Application\SyliusPluginTrait;
     use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-    final class AcmeExamplePlugin extends Bundle
+    final class VendorNameSyliusInvoicePlugin extends Bundle
     {
         use SyliusPluginTrait;
     }
@@ -144,7 +144,11 @@ Assuming you are creating the invoicing plugin as used above, this will result i
     {
         "autoload": {
             "psr-4": {
-                "VendorName\\SyliusInvoicePlugin\\": "src/",
+                "VendorName\\SyliusInvoicePlugin\\": "src/"
+            }
+        },
+        "autoload-dev": {
+            "psr-4": {
                 "Tests\\VendorName\\SyliusInvoicePlugin\\": "tests/"
             }
         },

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/validators.zh_CN.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/validators.zh_CN.yml
@@ -51,9 +51,9 @@ sylius:
         code:
             not_blank: 请输入区号。
             regex: 区域代码仅可以由字母、数字、破折号和下划线组成
-            unique: 区域编码必须唯一。
+            unique: 区域编码必须是唯一的。
         members:
-            min_count: 请至少添加{{ limit }} 地区会员。
+            min_count: 请至少添加 {{limit}} 区成员。
         name:
             max_length: 区域名称不能超过 255 个字符。
             min_length: 区域名称必须是至少 2 个字符长

diff --git a/src/Sylius/Bundle/MailerBundle/composer.json b/src/Sylius/Bundle/MailerBundle/composer.json
@@ -26,25 +26,14 @@
         "symfony/framework-bundle": "^3.2"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "~1.3",
-        "doctrine/orm": "~2.5.0",
-        "incenteev/composer-parameter-handler": "~2.0",
-        "ocramius/proxy-manager": "^1.0",
         "phpspec/phpspec": "^4.0",
         "phpunit/phpunit": "^5.6",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "swiftmailer/swiftmailer": "^6.0",
         "symfony/browser-kit": "^3.2",
         "symfony/dependency-injection": "^3.2",
-        "symfony/form": "^3.2",
-        "symfony/proxy-manager-bridge": "^3.3",
-        "symfony/security-csrf": "^3.2",
         "symfony/swiftmailer-bundle": "^3.0",
         "symfony/templating": "^3.2",
-        "symfony/translation": "^3.2",
-        "symfony/twig-bundle": "^3.2",
-        "symfony/validator": "^3.2",
-        "twig/twig": "^2.0"
+        "symfony/twig-bundle": "^3.2"
     },
     "config": {
         "bin-dir": "bin"

diff --git a/src/Sylius/Bundle/MailerBundle/phpunit.xml.dist b/src/Sylius/Bundle/MailerBundle/phpunit.xml.dist
@@ -4,7 +4,7 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="test/app/autoload.php"
+         bootstrap="vendor/autoload.php"
 >
     <php>
         <server name="KERNEL_DIR" value="test/app/" />

diff --git a/src/Sylius/Bundle/MailerBundle/test/app/AppKernel.php b/src/Sylius/Bundle/MailerBundle/test/app/AppKernel.php
@@ -27,7 +27,6 @@ public function registerBundles(): array
             new Sylius\Bundle\MailerBundle\SyliusMailerBundle(),
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
-            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
         ];
     }
 

diff --git a/src/Sylius/Bundle/MailerBundle/test/app/autoload.php b/src/Sylius/Bundle/MailerBundle/test/app/autoload.php
diff --git a/src/Sylius/Bundle/MailerBundle/test/app/config/config.yml b/src/Sylius/Bundle/MailerBundle/test/app/config/config.yml
@@ -3,30 +3,13 @@ imports:
 
 framework:
     assets: false
-    translator: { fallbacks: ["%locale%"] }
     secret: "%secret%"
-    router:
-        resource: "%kernel.root_dir%/config/routing.yml"
-    csrf_protection: true
     templating:
         engines: ['twig']
     default_locale: "%locale%"
-    session:
-        handler_id: ~
-        storage_id: session.storage.mock_file
     http_method_override: true
     test: ~
 
 twig:
     debug: "%kernel.debug%"
     strict_variables: "%kernel.debug%"
-
-doctrine:
-    dbal:
-        driver: "%database_driver%"
-        path: "%database_path%"
-        charset: UTF8
-    orm:
-        entity_managers:
-            default:
-                auto_mapping: true
diff --git a/src/Sylius/Bundle/MailerBundle/test/app/config/parameters.yml b/src/Sylius/Bundle/MailerBundle/test/app/config/parameters.yml
@@ -1,6 +1,3 @@
 parameters:
-    database_driver: pdo_sqlite
-    database_path: "%kernel.root_dir%/db.sql"
-
     locale: en_US
     secret: "Three can keep a secret, if two of them are dead."