Merge pull request #16 from moreonion/webform4

Cut webform 3 support & support optional elements

Author: torotil

.github/workflows/test.yaml

@@ -0,0 +1,54 @@
+on:
+  push:
+    branches: [ 7.x-1.x, 7.x-2.x ]
+  pull_request:
+    branches: [ 7.x-1.x, 7.x-2.x ]
+
+jobs:
+  phpunit:
+    runs-on: ubuntu-18.04
+    env:
+      DB_DATABASE: drupal
+      DB_USER: root
+      DB_PASSWORD: root
+    steps:
+    - uses: actions/checkout@v2
+    - name: "Setup PHP 7.3"
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: "7.3"
+    - name: Start MySQL
+      run: |
+        sudo systemctl start mysql
+        mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }};' -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }}
+    - name: Set env
+      run: |
+        echo "REPO=`pwd`" >> $GITHUB_ENV
+        echo "COMPOSER_HOME=${HOME}/.config/composer" >> $GITHUB_ENV
+        echo "ROOT=${HOME}/drupal-root" >> $GITHUB_ENV
+    - name: Get Composer Cache Directory
+      id: composer-cache
+      run: |
+        echo "::set-output name=dir::$(composer config cache-files-dir)"
+    - uses: actions/cache@v2
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-composer-
+        restore-keys: |
+          ${{ runner.os }}-composer-
+    - name: Install composer packages
+      run: |
+        mkdir -p $COMPOSER_HOME
+        cd $COMPOSER_HOME
+        composer require drush/drush:8.1.* phpunit/phpunit:^8 torotil/upal:2.0.0-RC1 stripe/stripe-php:7.27.2
+    - name: Bootstrap drupal
+      run: |
+        php -d sendmail_path=`which true` $COMPOSER_HOME/vendor/bin/drush.php --yes core-quick-drupal --core=drupal-7.69 --profile=testing --no-server --db-url=mysql://${{ env.DB_USER }}:${{ env.DB_PASSWORD }}@127.0.0.1:3306/${{ env.DB_DATABASE }} --root=$ROOT
+        ln -s $REPO $ROOT/sites/all/modules/module_under_test
+        cd $ROOT
+        curl https://www.drupal.org/files/issues/1891356-drupal_static_reset-on-module-changes-30-D7.patch | patch -p1
+        drush dl ctools form_builder-7.x-2.0-alpha2 jquery_update little_helpers psr0 select2 variable webform
+        drush --yes pm-enable autocomplete_api form_builder_webform
+    - name: Run phpunit tests
+      run: UPAL_ROOT=$ROOT UPAL_WEB_URL=http://127.0.0.1 XDEBUG_MODE=coverage phpunit --bootstrap=$COMPOSER_HOME/vendor/torotil/upal/bootstrap.php --coverage-clover=coverage.xml .
+    - uses: codecov/codecov-action@v1

.travis.yml

@@ -19,7 +19,7 @@ function _webform_defaults_autocomplete() {
     'pid' => 0,
     'weight' => 0,
     'value' => '',
-    'mandatory' => 1,
+    'required' => 1,
     'extra' => array(
       'width' => '',
       'unique' => 0,
@@ -75,7 +75,7 @@ function _webform_render_autocomplete($component, $value = NULL, $filter = TRUE)
   ArrayConfig::mergeDefaults($component, _webform_defaults_autocomplete());
   $element = [
     '#type' => 'autocomplete_api_select',
-    '#required' => !empty($component['mandatory']) || !empty($component['required']),
+    '#required' => !empty($component['required']),
     '#weight' => $component['weight'],
     '#theme_wrappers' => ['webform_element'],
     '#pre_render' => [],

autocomplete_api.component.inc

@@ -99,6 +99,11 @@ function autocomplete_api_element_process($element, &$form_state) {
  * Callback for _form_validate().
  */
 function _autocomplete_api_element_validate($element, &$form_state, $form) {
+  // Allow empty values if the element is not required.
+  if (empty($element['#required']) && empty($element['#value'])) {
+    return;
+  }
+  // Make sure a valid value was submitted.
   $client = Client::fromConfig($element['#dataset_key']);
   $value = drupal_json_decode($element['#value']);
   if (!$client->verifySignature($value)) {