Merge branch 'master' of https://github.com/coreshop/CoreShop

coreshop · Jan 7, 2020 · 3e2fef9 · 3e2fef9
2 parents 49cab0c + 505a8ae
commit 3e2fef9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/docs/02_Bundles/Pimcore_Bundle.md b/docs/02_Bundles/Pimcore_Bundle.md
@@ -119,7 +119,7 @@ final class Configuration implements ConfigurationInterface
 This extension allows you to store SerializedData inside a Pimcore DataObject.
 
 #### Embedded Class
-This extension allows you to embedd other Pimcore Classes into one Pimcore Class.
+This extension allows you to embed other Pimcore Classes into one Pimcore Class.
 
 The data tree looks like this then:
 
@@ -132,4 +132,4 @@ You can inherit this as deep as you want, but be careful. The deeper it goes, th
 
 ![Embeded Class Data](img/embedded_class_data.png)
 
-![Embeded Class Data](img/embedded_class_tag.png)
+![Embeded Class Data](img/embedded_class_tag.png)
diff --git a/docs/02_Bundles/Resource_Bundle/01_CustomEntities.md b/docs/02_Bundles/Resource_Bundle/01_CustomEntities.md
@@ -21,7 +21,7 @@ interface CustomEntityInterface extends ResourceInterface, TranslatableInterface
 
 //AppBundle/Model/CustomEntity.php
 
-interface CustomEntity implements CustomEntityInterface {
+class CustomEntity implements CustomEntityInterface {
     use TranslatableTrait {
         __construct as private initializeTranslationsCollection;
     }
@@ -84,7 +84,7 @@ interface CustomEntityTranslationInterface extends ResourceInterface, Timestampa
 
 //AppBundle/Model/CustomEntityTranslation.php
 
-class CustomEntityTranslation extends AbstractTranslation implements CountryTranslationInterface
+class CustomEntityTranslation extends AbstractTranslation implements CustomEntityTranslationInterface
 {
     protected $id;
     protected $name;
@@ -182,11 +182,11 @@ final class Configuration implements ConfigurationInterface
                 ->arrayNode('resources')
                     ->addDefaultsIfNotSet()
                     ->children()
-                        ->arrayNode('country')
+                        ->arrayNode('custom_entity')
                             ->addDefaultsIfNotSet()
                             ->children()
                                 ->variableNode('options')->end()
-                                ->scalarNode('permission')->defaultValue('country')->cannotBeOverwritten()->end()
+                                ->scalarNode('permission')->defaultValue('custom_entity')->cannotBeOverwritten()->end()
                                 ->arrayNode('classes')
                                     ->addDefaultsIfNotSet()
                                     ->children()
@@ -321,4 +321,4 @@ GET: /admin/app/custom_entity/list
 GET: /admin/app/custom_entity/get
 POST: /admin/app/custom_entity/add
 POST: /admin/app/custom_entity/save
-DELETE: /admin/app/custom_entity/delete
+DELETE: /admin/app/custom_entity/delete
diff --git a/docs/02_Bundles/Resource_Bundle/02_PimcoreEntities.md b/docs/02_Bundles/Resource_Bundle/02_PimcoreEntities.md
@@ -21,7 +21,7 @@ interface PimcoreEntityInterface extends ResourceInterface
 <?php
 //AppBundle/Model/PimcoreEntity.php
 
-class PimcoreEntity extends AbstractPimcoreModel implements AddressInterface, PimcoreModelInterface {
+class PimcoreEntity extends AbstractPimcoreModel implements PimcoreEntityInterface, PimcoreModelInterface {
     public function getName($language = null) {
         throw new ImplementedByPimcoreException(__CLASS__, __METHOD__);
     }
@@ -118,4 +118,4 @@ or use automated generated Factory/Repository Classes
 $pimcoreEntityObject = $container->get('app.repository.pimcore_entity')->findBy($id);
 
 $list = $container->get('app.repository.pimcore_entity')->getList();
-```
+```
diff --git a/src/CoreShop/Bundle/RuleBundle/README.md b/src/CoreShop/Bundle/RuleBundle/README.md
@@ -1,4 +1,4 @@
-CoreShop Resource Bundle
+CoreShop Rule Bundle
 ==================
 
 CoreShop