Update 2.x with 1.x.

.drone.yml

@@ -30,10 +30,8 @@ pipeline:
     volumes:
       - /cache:/cache
     commands:
-      # @todo remove "composer install" step once the following issue is fixed.
-      # @link https://webgate.ec.europa.eu/CITnet/jira/browse/OPENEUROPA-1234
-      - composer install --ansi --no-suggest --no-progress
-      - composer update --prefer-lowest --prefer-stable --ansi --no-suggest --no-progress
+      - composer self-update --2
+      - composer update --prefer-lowest --prefer-stable --ansi --no-progress
     when:
       matrix:
         COMPOSER_BOUNDARY: lowest
@@ -44,14 +42,16 @@ pipeline:
     volumes:
       - /cache:/cache
     commands:
-      - composer install --ansi --no-suggest --no-progress
+      - composer self-update --2
+      - composer install --ansi --no-progress
     when:
       matrix:
         COMPOSER_BOUNDARY: highest
 
   site-install:
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     commands:
+      -  while ! mysqladmin ping -h mysql --silent; do sleep 1; done
       - ./vendor/bin/run drupal:site-install
 
   grumphp:
@@ -66,16 +66,10 @@ pipeline:
     commands:
       - ./vendor/bin/phpunit
 
-  behat:
-    group: test
-    image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
-    commands:
-      - ./vendor/bin/behat --strict
-
 matrix:
   COMPOSER_BOUNDARY:
     - lowest
     - highest
   PHP_VERSION:
-    - 7.2
-    - 7.3
+    - 7.4
+    - 8.0

.gitignore

@@ -12,3 +12,4 @@ vendor
 yarn.lock
 phpunit.xml
 docker-compose.*.yml
+/.gitattributes

CHANGELOG.md

@@ -1,13 +1,48 @@
-# Change Log
+# Changelog
+
+## [1.8.0](https://github.com/openeuropa/oe_search/tree/1.8.0) (2021-11-08)
+
+[Full Changelog](https://github.com/openeuropa/oe_search/compare/1.7.0...1.8.0)
+
+**Merged pull requests:**
+
+- EWPP-1706: Fixing test page navigation in other languages. [\#52](https://github.com/openeuropa/oe_search/pull/52) ([upchuk](https://github.com/upchuk))
+- EWPP-1577: Update to D9 and convert behat tests to phpunit [\#51](https://github.com/openeuropa/oe_search/pull/51) ([brummbar](https://github.com/brummbar))
+
+## [1.7.0](https://github.com/openeuropa/oe_search/tree/1.7.0) (2021-09-27)
+
+[Full Changelog](https://github.com/openeuropa/oe_search/compare/1.6.0...1.7.0)
+
+**Merged pull requests:**
+
+- Prepare release 1.7.0. [\#50](https://github.com/openeuropa/oe_search/pull/50) ([imanoleguskiza](https://github.com/imanoleguskiza))
+- EWPP-1465: Enable non-eu languages: is, nb. [\#49](https://github.com/openeuropa/oe_search/pull/49) ([yenyasinn](https://github.com/yenyasinn))
+- EWPP-1478: Add interface translations in non-eu languages. [\#48](https://github.com/openeuropa/oe_search/pull/48) ([yenyasinn](https://github.com/yenyasinn))
+- Fix release branch for 1.6.0 changelog generation. [\#47](https://github.com/openeuropa/oe_search/pull/47) ([brummbar](https://github.com/brummbar))
+
+## [1.6.0](https://github.com/openeuropa/oe_search/tree/1.6.0) (2021-08-16)
+
+[Full Changelog](https://github.com/openeuropa/oe_search/compare/1.5.0...1.6.0)
+
+**Merged pull requests:**
+
+- Prepare changelog for release 1.6.0. [\#46](https://github.com/openeuropa/oe_search/pull/46) ([brummbar](https://github.com/brummbar))
+- EWPP-1289: Add missing interface translations. [\#44](https://github.com/openeuropa/oe_search/pull/44) ([yenyasinn](https://github.com/yenyasinn))
+- EWPP-721: Update xdebug configuration. [\#27](https://github.com/openeuropa/oe_search/pull/27) ([22Alexandra](https://github.com/22Alexandra))
+- EWPP-529: Replace scaffold library. [\#25](https://github.com/openeuropa/oe_search/pull/25) ([sergepavle](https://github.com/sergepavle))
+- EWPP-516: Update docker images. [\#24](https://github.com/openeuropa/oe_search/pull/24) ([22Alexandra](https://github.com/22Alexandra))
 
 ## [1.5.0](https://github.com/openeuropa/oe_search/tree/1.5.0) (2020-06-19)
+
 [Full Changelog](https://github.com/openeuropa/oe_search/compare/1.4.0...1.5.0)
 
 **Merged pull requests:**
 
+- Update CHANGELOG.md for release 1.5.0. [\#23](https://github.com/openeuropa/oe_search/pull/23) ([brummbar](https://github.com/brummbar))
 - OPENEUROPA-3286: Translation of word Search in Lithuanian and Latvian are swapped [\#22](https://github.com/openeuropa/oe_search/pull/22) ([brummbar](https://github.com/brummbar))
 
 ## [1.4.0](https://github.com/openeuropa/oe_search/tree/1.4.0) (2020-04-08)
+
 [Full Changelog](https://github.com/openeuropa/oe_search/compare/1.3.0...1.4.0)
 
 **Merged pull requests:**
@@ -22,6 +57,7 @@
 - OPENEUROPA-2258: Use PHP 7.2 in drone and docker image. [\#13](https://github.com/openeuropa/oe_search/pull/13) ([dxvargas](https://github.com/dxvargas))
 
 ## [1.3.0](https://github.com/openeuropa/oe_search/tree/1.3.0) (2019-09-24)
+
 [Full Changelog](https://github.com/openeuropa/oe_search/compare/1.2.0...1.3.0)
 
 **Merged pull requests:**
@@ -30,6 +66,7 @@
 - OPENEUROPA-2286: Check redirect headers instead of waiting for an external resource. [\#12](https://github.com/openeuropa/oe_search/pull/12) ([imanoleguskiza](https://github.com/imanoleguskiza))
 
 ## [1.2.0](https://github.com/openeuropa/oe_search/tree/1.2.0) (2019-07-11)
+
 [Full Changelog](https://github.com/openeuropa/oe_search/compare/1.1.0...1.2.0)
 
 **Merged pull requests:**
@@ -39,6 +76,7 @@
 - OPENEUROPA-1897: Use ci image. [\#8](https://github.com/openeuropa/oe_search/pull/8) ([imanoleguskiza](https://github.com/imanoleguskiza))
 
 ## [1.1.0](https://github.com/openeuropa/oe_search/tree/1.1.0) (2019-05-07)
+
 [Full Changelog](https://github.com/openeuropa/oe_search/compare/1.0.0...1.1.0)
 
 **Merged pull requests:**
@@ -47,6 +85,9 @@
 - OPENEUROPA-1813: Upgrading to 8.7. [\#6](https://github.com/openeuropa/oe_search/pull/6) ([upchuk](https://github.com/upchuk))
 
 ## [1.0.0](https://github.com/openeuropa/oe_search/tree/1.0.0) (2019-04-25)
+
+[Full Changelog](https://github.com/openeuropa/oe_search/compare/205c202f4d60497fed87f30a550e0ae3dc0c8d99...1.0.0)
+
 **Merged pull requests:**
 
 - Update CHANGELOG.md for release 1.0.0. [\#5](https://github.com/openeuropa/oe_search/pull/5) ([ademarco](https://github.com/ademarco))
@@ -56,4 +97,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

README.md

@@ -30,7 +30,19 @@ It will also perform token substitution in development configuration files such
 ./vendor/bin/run drupal:site-install
 ```
 
-The development site web root should be available in the `build` directory.
+Your test site will be available at [http://localhost:8080/build](http://localhost:8080/build).
+
+**Please note:** project files and directories are symlinked within the test site by using the
+[OpenEuropa Task Runner's Drupal project symlink](https://github.com/openeuropa/task-runner-drupal-project-symlink) command.
+
+If you add a new file or directory in the root of the project, you need to re-run `drupal:site-setup` in order to make
+sure they are be correctly symlinked.
+
+If you don't want to re-run a full site setup for that, you can simply run:
+
+```
+$ ./vendor/bin/run drupal:symlink-project
+```
 
 ### Using Docker Compose
 

composer.json

@@ -6,23 +6,28 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "drupal/core": "^8.7",
-        "php": ">=7.2"
+        "php": ">=7.4",
+        "drupal/core": "^9.2"
     },
     "require-dev": {
-        "composer/installers": "~1.5",
-        "drupal/core-composer-scaffold": "^8.8",
-        "drupal/config_devel": "~1.2",
-        "drupal/drupal-extension": "~4.0",
-        "drush/drush": "~9.0",
-        "guzzlehttp/guzzle": "~6.3",
-        "openeuropa/behat-transformation-context" : "~0.1",
-        "openeuropa/code-review": "~1.0@beta",
-        "openeuropa/drupal-core-require-dev": "^8.7",
-        "openeuropa/task-runner": "~1.0@beta",
-        "openeuropa/oe_multilingual": "^1.1",
-        "phpunit/phpunit": "~6.0"
+        "composer/installers": "^1.5",
+        "drupal/core-composer-scaffold": "^9.2",
+        "drupal/config_devel": "^1.2",
+        "drush/drush": "^10.3",
+        "drupal/core-dev": "^9.2",
+        "drupal/ctools": "^3.7",
+        "drupal/token": "^1.10",
+        "egulias/email-validator": "^2.1.22 || ^3.0",
+        "openeuropa/oe_multilingual": "^1.10",
+        "openeuropa/code-review": "^2.0",
+        "openeuropa/task-runner-drupal-project-symlink": "^1.0.0-beta5",
+        "phpspec/prophecy-phpunit": "^1 || ^2"
     },
+    "_readme": [
+        "Explicit requirement for egulias/email-validator due to https://www.drupal.org/project/drupal/issues/3061074#comment-14300579. It can be removed when Drupal core 9.2 support is droppped.",
+        "Explicit lower version requirement of ctools due to Drupal core 9.2 compatibility.",
+        "Explicit requirement of token module due to PHP7.4 compatbility."
+    ],
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
         "post-update-cmd": "./vendor/bin/run drupal:site-setup"
@@ -40,7 +45,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Drupal\\Tests\\oe_search\\": "./tests/"
+            "Drupal\\Tests\\oe_search\\": "./tests/src/"
         }
     },
     "extra": {
@@ -59,6 +64,13 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "drupal/core-composer-scaffold": true,
+            "phpro/grumphp": true
+        }
     }
 }

docker-compose.yml

@@ -1,14 +1,15 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php-dev:7.3
+    image: fpfis/httpd-php-dev:8.0
     working_dir: /var/www/html
     ports:
       - 8080:8080
     volumes:
       - .:/var/www/html # Non Mac users.
       # - nfsmount:/var/www/html # Mac Users with the nfsmount volume.
     environment:
+      COMPOSERVER: "--2"
       XDEBUG_CONFIG: "client_host=172.17.0.1" # Non-Mac users.
       # XDEBUG_CONFIG: "client_host=host.docker.internal" # Mac users.
       XDEBUG_MODE: "develop, debug"

grumphp.yml.dist

@@ -12,3 +12,7 @@ parameters:
     - theme
     - install
     - yml
+grumphp:
+  git_hook_variables:
+    EXEC_GRUMPHP_COMMAND: 'docker-compose exec -T web'
+

modules/oe_search_demo/oe_search_demo.info.yml

@@ -1,3 +1,3 @@
 name: OpenEuropa Search Demo
-core: 8.x
+core_version_requirement: ^9.2
 type: module

oe_search.info.yml

@@ -3,7 +3,7 @@ description: Search features for the OpenEuropa project.
 package: OpenEuropa
 
 type: module
-core: 8.x
+core_version_requirement: ^9.2
 
 'interface translation project': oe_search
 # The path to the actual translations is defined in

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="${drupal.root}/core/tests/bootstrap.php" backupGlobals="true" colors="true" >
+<phpunit bootstrap="${drupal.root}/core/tests/bootstrap.php" backupGlobals="true" colors="true" cacheResult="false">
   <php>
     <ini name="error_reporting" value="32767"/>
     <ini name="memory_limit" value="-1"/>
@@ -8,8 +8,8 @@
     <env name="SIMPLETEST_DB" value="mysql://${drupal.database.user}:${drupal.database.password}@${drupal.database.host}:${drupal.database.port}/${drupal.database.name}"/>
   </php>
   <testsuites>
-    <testsuite>
-      <directory>./tests/</directory>
+    <testsuite name="OpenEuropa Search tests">
+      <directory>./tests/src/</directory>
     </testsuite>
   </testsuites>
 </phpunit>

runner.yml.dist

@@ -36,12 +36,9 @@ drupal:
 
 commands:
   drupal:site-setup:
-    - { task: "symlink", from: "../../..", to: "${drupal.root}/modules/custom/oe_search" }
+    - { task: "run", command: "drupal:symlink-project" }
     - { task: "run", command: "drupal:drush-setup" }
     - { task: "run", command: "drupal:settings-setup" }
     - { task: "run", command: "setup:phpunit" }
-    - { task: "run", command: "setup:behat" }
   setup:phpunit:
     - { task: "process", source: "phpunit.xml.dist", destination: "phpunit.xml" }
-  setup:behat:
-    - { task: "process", source: "behat.yml.dist", destination: "behat.yml" }

src/Plugin/Block/SearchFormBlock.php

@@ -30,7 +30,7 @@ class SearchFormBlock extends BlockBase implements ContainerFactoryPluginInterfa
   protected $formBuilder;
 
   /**
-   * Constructs an Search block object.
+   * Constructs a Search block object.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.