Merge branch '1.5' into 1.7

ezpublishlegacy · May 18, 2017 · f365a3d · f365a3d
2 parents 0ecf834 + 92c2517
commit f365a3d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/bundle/Resources/translations/ezplatform_fields_groups.en.xlf b/bundle/Resources/translations/ezplatform_fields_groups.en.xlf
@@ -11,6 +11,11 @@
         <target>Content</target>
         <note>key: content</note>
       </trans-unit>
+      <trans-unit id="4c24b2612e94e2ae622e54397663f2b7bf0a2e17" resname="metadata">
+        <source>Metadata</source>
+        <target>Metadata</target>
+        <note>key: metadata</note>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/features/Context/ContentType.php b/features/Context/ContentType.php
@@ -71,6 +71,7 @@ public function createContentType(ContentTypeCreateStruct $struct)
         if (!isset($struct->mainLanguageCode)) {
             $struct->mainLanguageCode = 'eng-GB';
         }
+
         if (!isset($struct->names)) {
             $struct->names = ['eng-GB' => $struct->identifier];
         }

diff --git a/lib/Form/Processor/RoleFormProcessor.php b/lib/Form/Processor/RoleFormProcessor.php
@@ -9,7 +9,6 @@
 namespace EzSystems\RepositoryForms\Form\Processor;
 
 use eZ\Publish\API\Repository\RoleService;
-use eZ\Publish\API\Repository\Values\User\RoleDraft;
 use EzSystems\RepositoryForms\Event\FormActionEvent;
 use EzSystems\RepositoryForms\Event\RepositoryFormEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

diff --git a/tests/RepositoryForms/Twig/FieldEditRenderingExtensionTest.php b/tests/RepositoryForms/Twig/FieldEditRenderingExtensionTest.php
@@ -42,7 +42,7 @@ public function getExtensions()
 
     public function getFixturesDir()
     {
-        return dirname(__FILE__) . '/_fixtures/field_edit_rendering_functions/';
+        return __DIR__ . '/_fixtures/field_edit_rendering_functions/';
     }
 
     public function getFieldDefinitionData($typeIdentifier, $id = null, $settings = array())