Merge branch 'release/7.2.24'

Author: d34dman

Drush/EntityScaffolder/d7_1/Scaffolder.php

@@ -9,7 +9,7 @@
 
 class Scaffolder extends ScaffolderBase {
   // @see http://php.net/version_compare.
-  const VERSION = '7.2.18';
+  const VERSION = '7.2.24';
 
   const DEFAULT_TEMPLATE_DIR = __DIR__ . '/templates';
   const TEMPLATE_NAMESPACE = 'd7_1';

Drush/EntityScaffolder/d7_1/templates/field/entityreference/base/feature.content.twig

@@ -24,7 +24,7 @@
         ),
         'sort' => array(
           'direction' => 'ASC',
-          'property' => {% if target_sort_by_property is empty %}'title'{% else %}{{ target_sort_by_property }}{% endif %},
+          'property' => {% if target_sort_by_property is empty %}'title'{% else %}'{{ target_sort_by_property }}'{% endif %},
           'type' => 'property',
         ),
         'target_bundles' => array(
@@ -37,4 +37,4 @@
     ),
     'translatable' => 0,
     'type' => 'entityreference',
-  );
+  );

Drush/EntityScaffolder/d7_1/templates/field/entityreference/instance/feature.content.twig

@@ -44,7 +44,25 @@
 {% endif %}
 {% if widget_type == 'inline_entity_form' %}
       'module' => 'inline_entity_form',
-      'settings' => array(),
+      {% if widget_settings is not empty %}
+        'settings' => array(
+        'fields' => array(),
+        {% if widget_settings.type_settings is not empty %}
+          'type_settings' => array(
+          'allow_clone' => {{ widget_settings.type_settings.allow_clone | default("0") }},
+          'allow_existing' => {{ widget_settings.type_settings.allow_existing | default("0") }},
+          'allow_new' => {{ widget_settings.type_settings.allow_new | default("0") }},
+          'delete_references' => {{ widget_settings.type_settings.delete_references | default("0") }},
+          'label_plural' => {{ widget_settings.type_settings.label_plural | default("nodes") }},
+          'label_singular' => {{ widget_settings.type_settings.label_singular | default("node") }},
+          'match_operator' => {{ widget_settings.type_settings.match_operator | default("CONTAINS") }},
+          'override_labels' => {{ widget_settings.type_settings.override_labels | default("0") }},
+          ),
+        {% endif %}
+        ),
+      {% else %}
+        'settings' => array(),
+      {% endif %}
       'type' => 'inline_entity_form',
 {% endif %}
 {% if widget_type == 'entityreference_autocomplete' %}

Drush/EntityScaffolder/d7_1/templates/field/image/base/config.yaml

@@ -1,4 +1,11 @@
 dependencies :
   - file
   - media
-  - image
+  - image
+variables :
+  file_extensions :
+    type : string
+    placeholder : 'png gif jpg jpeg'
+    required : false
+    default : 'png gif jpg jpeg'
+    description: Provide list of extensions seperated by space. Eg. 'png gif jpg jpeg'

Drush/EntityScaffolder/d7_1/templates/field/image/instance/config.yaml

@@ -0,0 +1,11 @@
+dependencies :
+  - file
+  - media
+  - image
+variables :
+  file_extensions :
+    type : string
+    placeholder : 'png gif jpg jpeg'
+    required : false
+    default : 'png gif jpg jpeg'
+    description: Provide list of extensions seperated by space. Eg. 'png gif jpg jpeg'

Drush/EntityScaffolder/d7_1/templates/field/image/instance/feature.content.twig

@@ -25,7 +25,7 @@
       'alt_field' => 1,
       'default_image' => 0,
       'file_directory' => '{{ entity_type }}/{{ bundle }}',
-      'file_extensions' => 'png gif jpg jpeg',
+      'file_extensions' => '{{ file_extensions }}',
       'max_filesize' => '',
       'max_resolution' => '',
       'min_resolution' => '',

Drush/EntityScaffolder/d7_1/templates/preprocess/es_helper/es_helper.module

@@ -385,12 +385,35 @@ function es_helper_preprocess_brightcove_field_embed(array &$vars) {
   // Getting brightcove video id.
   $video_id = $video->getId();
   $video_name = $video->getName();
+  $video_description = !empty($video->getDescription()) ? $video->getDescription() : $video->getName();
+  $video_upload_data = $video->getCreatedAt();
+  $video_thumbnail_url = !empty($video->getImages()['thumbnail']) ? $video->getImages()['thumbnail']->getSrc() : '';
 
   // Creating the variables which we need in brightcove player template
   // for tracking purpose.
   $vars['brightcove_video_id'] = $video_id;
   $vars['video_name'] = $video_id . ':' . $video_name;
   $vars['id'] = es_helper_get_unique_video_id($video_id);
+  $vars['video_description'] = $video_description;
+  $vars['video_upload_data'] = $video_upload_data;
+  $vars['video_thumbnail_url'] = $video_thumbnail_url;
+}
+
+/**
+ * Debug helper to show modules which can't be enabled.
+ */
+function es_helper_debug_modules_enabled($path = 'modules_enabled.txt') {
+  $content = file_get_contents($path);
+  if ($content) {
+    $modules = explode("\n", $content);
+    $modules = array_map('trim', $modules);
+    $modules = array_filter($modules);
+    foreach ($modules as $module) {
+      if (!module_enable([$module])) {
+        drupal_set_message(t("can't enable module %module", ['%module' => $module]));
+      }
+    }
+  }
 }
 
 /**

Drush/EntityScaffolder/d7_1/templates/preprocess/es_helper/es_helper.preprocess.default.inc

@@ -20,10 +20,14 @@
      $out = [];
      $items = [];
      // Extract each values into $items variable.
-     foreach (element_children($render_array[$field_name]) as $key) {
-       $items[] = $render_array[$field_name][$key];
-       unset($render_array[$field_name][$key]);
+     if (isset($render_array[$field_name]) && is_array($render_array[$field_name])) {
+       // Extract each values into $items variable.
+       foreach (element_children($render_array[$field_name]) as $key) {
+         $items[] = $render_array[$field_name][$key];
+         unset($render_array[$field_name][$key]);
+       }
      }
+     $weight = 0;
      // At this point `$render_array[$field_name]`
      // is an empty field template.
      foreach ($items as $item) {
@@ -32,7 +36,9 @@
        $v = $render_array[$field_name];
        $v['#label_display'] = 'hidden';
        $v['0'] = $item;
+       $v['#weight'] = $weight;
        $out[] = $v;
+       $weight++;
      }
    }
    return $out;

Drush/EntityScaffolder/potx/potx.inc

@@ -1045,19 +1045,25 @@ function _potx_find_context($tf, $ti, $file, $function_name) {
     // argument is coming up, which might have a key for context.
     list($com, $arr, $par) = array($_potx_tokens[$ti], $_potx_tokens[$ti+1], $_potx_tokens[$ti+2]);
     // @HACK check $arr[1] is empty or not before accessing it.
-    if ($com == ',' && !empty($arr[1]) && $arr[1] == 'array' && $par == '(') {
+    if ($com == ',' && ($forward = _potx_is_beginning_of_array($arr, $par))) {
       $nesting = 0;
-      $ti += 3;
+      $ti += $forward;
       // Go through to either the end of the array or to the key definition of
       // context on the same nesting level.
       while (!((is_array($_potx_tokens[$ti]) && (in_array($_potx_tokens[$ti][1], array('"context"', "'context'"))) && ($_potx_tokens[$ti][0] == T_CONSTANT_ENCAPSED_STRING) && ($nesting == 0)) ||
-               ($_potx_tokens[$ti] == ')' && $nesting == -1))) {
+        (_potx_is_end_of_array($_potx_tokens[$ti]) && $nesting == -1))) {
         $ti++;
         if (!is_array($_potx_tokens[$ti])) {
-          if ($_potx_tokens[$ti] == ')') {
+          // Treat each () and [] pair as going into / out of nesting levels.
+          // There may be function or method calls as well as nested short
+          // arrays within the arguments list. The list may be similar to:
+          // array('langcode' => $obj->someMethod([])[2], 'context' => 'Long month name')
+          // or
+          // ['langcode' => $obj->someMethod(array())[2], 'context' => 'Long month name']
+          if ($_potx_tokens[$ti] == ')' || $_potx_tokens[$ti] == ']') {
             $nesting--;
           }
-          if ($_potx_tokens[$ti] == '(') {
+          if ($_potx_tokens[$ti] == '(' || $_potx_tokens[$ti] == '[') {
             $nesting++;
           }
         }
@@ -1657,4 +1663,37 @@ function _potx_get_banned_strings($reset = FALSE, $dir = NULL) {
 
   }
   return $banned_strings;
+}
+
+/**
+ * Determines if processing an array.
+ *
+ * @param string|string[] $arr
+ * @param string|NULL $par
+ *
+ * @return int|FALSE
+ *   The number to forward the current position forward to start processing the
+ *   array. FALSE if not processing an array.
+ */
+function _potx_is_beginning_of_array($arr, $par) {
+  if ($arr === '[' && is_array($par)) {
+    return 2;
+  }
+  if (is_array($arr) && $arr[1] == 'array' && $par == '(') {
+    return 3;
+  }
+  return FALSE;
+}
+
+/**
+ * Determines if at the end of an array.
+ *
+ * @param string $token
+ *   The token being processed.
+ *
+ * @return bool
+ *   TRUE is  at the end of an array, FALSE if not.
+ */
+function _potx_is_end_of_array($token) {
+  return $token == ')' || $token == ']';
 }

docs/configurations/config.md

@@ -17,10 +17,14 @@ templates:
     dir: /.entity_scaffolder/factorial
 
 # Pass the project specific directory locations.
-directories :
-  theme : sites/all/themes/custom/my_custom_theme
-  templates : sites/all/themes/custom/my_custom_theme/templates
-  patternlab : sites/all/themes/custom/my_custom_theme/source
+directories:
+  theme: sites/all/themes/custom/my_custom_theme
+  templates: sites/all/themes/custom/my_custom_theme/templates
+  patternlab: sites/all/themes/custom/my_custom_theme/source
+  patternlab_image_data: sites/all/themes/custom/my_custom_theme/source/_patterns/01-atoms/image-picture
+patternlab:
+  components:
+    image: 'image-picture'
 ```
 
 ### Key/value pairs
@@ -67,11 +71,23 @@ These can be supplied as such.
 
 ```yaml
 # Pass the project specific directory locations.
-directories :
+directories:
   # Location of custom theme
-  theme : sites/all/themes/custom/my_custom_theme
+  theme: sites/all/themes/custom/my_custom_theme
   # Location of template directory within the custom theme
-  templates : sites/all/themes/custom/my_custom_theme/templates
+  templates: sites/all/themes/custom/my_custom_theme/templates
   # Location of patternlab source folder.
-  patternlab : sites/all/themes/custom/my_custom_theme/source
+  patternlab: sites/all/themes/custom/my_custom_theme/source
+  # Location where sample image data (as yaml files) for responsive image will be
+  # generated based on picture mapping.
+  patternlab_image_data: sites/all/themes/custom/my_custom_theme/source/_patterns/01-atoms/image-picture
+```
+
+#### patternlab
+The following configuration along with `directories.patternlab_image_data` is used to generate the image data. `patternlab.components.image` should be the name of the image component.
+
+```yaml
+patternlab:
+  components:
+    image: 'image-picture'
 ```