Master branch update with Drupal 9 support

README.md

@@ -1,11 +1,27 @@
-# OS2Forms Drupal 8 project
+# OS2Forms Drupal 8/9 project
 
 [![Build Status](https://travis-ci.org/OS2Forms/os2forms8.svg?branch=master)](https://travis-ci.org/OS2Forms/os2forms8)
 
 ## Getting Started
 
 These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system.
 
+### Drupal 9 readiness.
+
+At the current moment OS2Forms is ready to install or upgrade to Drupal 9 version.
+
+PLAN THE UPGRADE TO DRUPAL 9 VERSION OF OS2FORMS **AS SOON AS POSSIBLE**
+
+See detailed [steps to update your project to Drupal 9](https://github.com/OS2Forms/os2forms8/tree/develop#upgrade-from-drupal-8-to-drupal-9) below in this page.
+
+Drupal 8 version is still maintained to get bugfixes.
+However, due to EOL of Drupal 8 in November 2021 Drupal core will not get its security update.
+
+If you still use Drupal 8 version of OS2Forms you can use following branches to get updates on bugfixes or other issues:
+- `master-d8`
+- `staging-d8`
+- `develop-d8`
+
 ### Traditional
 
 #### Installing
@@ -208,6 +224,59 @@ to `setttings.local.php`. See [Enable Drupal 8 backend errorlog/debugging
 mode](https://www.drupal.org/forum/support/post-installation/2018-07-18/enable-drupal-8-backend-errorlogdebugging-mode)
 for further details.
 
+## Upgrade from Drupal 8 to Drupal 9
+
+Upgrading process from 8 to 9 version is not very different from update Drupal from minor versions in Drupal 8.
+However, there is some important steps you should be aware of.
+
+It's recommended to do upgrade first on **TEST** environment before upgrading **PROD** environment.
+
+See following steps to get your project upgraded to Drupal 9.
+
+### 1. System requirements
+Before upgrade to Drupal 9 be sure that your server cover [system requirements for Drupal 9](https://www.drupal.org/docs/understanding-drupal/how-drupal-9-was-made-and-what-is-included/environment-requirements-of-drupal-9)
+The most important of them are:
+- [PHP version](https://www.drupal.org/docs/understanding-drupal/how-drupal-9-was-made-and-what-is-included/environment-requirements-of-drupal-9#s-php-version-requirement)
+- [Mysql db version](https://www.drupal.org/docs/understanding-drupal/how-drupal-9-was-made-and-what-is-included/environment-requirements-of-drupal-9#s-database-backend-and-other-hosting-requirements)
+
+### 2. Making dumps
+
+Before upgrade make sure you get DB dump to be able to roll back your project to stable state in case of unsuccessful upgrade
+
+### 3. Update code
+
+In order to upgrade your project to Drupal 9 get the latest version of `develop`, `staging` or  `master` branch.
+
+Download 3rd party dependencies via composer:
+
+```shell
+composer install
+```
+
+### 4. Rebuild cache and run database update.
+
+Run following commands:
+
+```shell
+drush cr
+drush updb
+```
+
+### 5. Testing
+Test essential functionality in your OS2Forms project.
+OS2Forms has general test cases you can go through to be sure that your project works as it should.
+It includes general Drupal test cases and additional test cases that cover basic OS2Forms functionality.
+Test cases:
+- Frontpage work
+- User can loging
+- User can create webform
+- Webform can be submitted
+- Nemid field can be added
+- User can login via nemid and see prefilled data in nemid fields
+
+NOTE: This list might not include some cases that is crucial for you installation.
+If you think that this list has missing test cases that are crucial for OS2Forms in general, feel free to [submit an issue](https://github.com/OS2Forms/os2forms8/issues) and describe the issue you are missing there.
+
 ## Contributing
 
 OS2Forms projects is open for new features and os course bugfixes. If you have any suggestion, or you found a bug in project, you are very welcome to create an issue in github repository issue tracker. For issue description there is expected that you will provide clear and sufficient information about your feature request or bug report.

composer.json

@@ -10,51 +10,121 @@
         }
     ],
     "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://git.drupalcode.org/project/monolog.git"
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "drupal/webform_embed",
+                "type": "drupal-module",
+                "version": "1.x-dev",
+                "dist": {
+                    "type": "zip",
+                    "url": "https://ftp.drupal.org/files/projects/webform_embed-8.x-1.x-dev.zip",
+                    "shasum": ""
+                }
+            }
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "drupal/webform_permissions_by_term",
+                "version": "1.2.0",
+                "dist": {
+                    "type": "zip",
+                    "url": "https://ftp.drupal.org/files/projects/webform_permissions_by_term-8.x-1.2.zip",
+                    "reference": "8.x-1.2",
+                    "shasum": "eabcfdbbbc850986fdd0d8b3a26cad8d6b5d675e"
+                },
+                "require": {
+                    "drupal/core": "~8.0 || ^9.0",
+                    "drupal/permissions_by_term": "*"
+                },
+                "type": "drupal-module"
+            }
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "drupal/rules",
+                "description": "React on events and conditionally evaluate actions.",
+                "type": "drupal-module",
+                "license": "GPL-2.0-or-later",
+                "homepage": "https://www.drupal.org/project/rules",
+                "support": {
+                    "issues": "https://www.drupal.org/project/issues/rules",
+                    "source": "https://git.drupalcode.org/project/rules"
+                },
+                "require": {
+                    "drupal/core": "^8.8.2 || ^9",
+                    "drupal/typed_data": "^1.0"
+                },
+                "minimum-stability": "dev",
+                "extra": {
+                    "drush": {
+                        "services": {
+                            "drush.services.yml": "^9 || ^10"
+                        }
+                    }
+                },
+                "version": "3.0.0-alpha6",
+                "source": {
+                    "url": "https://git.drupalcode.org/project/rules.git",
+                    "type": "git",
+                    "reference": "b92e91537fcb47e0dfd5eba4e3c5c9b79e543eca"
+                }
+            }
+        },
         {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
         }
     ],
     "require": {
         "php": ">=7.1",
-        "composer/installers": "^1.2",
-        "cweagans/composer-patches": "^1.6.5",
+        "composer/installers": "^1.9",
+        "cweagans/composer-patches": "^1.7",
         "drupal/bootstrap": "^3.21",
-        "drupal/coc_forms_auto_export": "2.0.0-alpha1 as 1.0.0-alpha1",
         "drupal/config_entity_revisions": "1.7.0",
         "drupal/console": "^1.0.2",
-        "drupal/core": "^8.9",
-        "drupal/core-composer-scaffold": "^8.9",
-        "drupal/devel": "^4.1",
+        "drupal/core-composer-scaffold": "^9.1",
+        "drupal/core-recommended": "^9.1",
         "drupal/fontyourface": "^3.2",
-        "drupal/header_and_footer_scripts": "^2.2",
-        "drupal/ldap": "^3.0@beta",
+        "drupal/header_and_footer_scripts": "^3.0",
+        "drupal/ldap": "^4.2",
         "drupal/migrate_tools": "^5.0",
         "drupal/migrate_upgrade": "^3.2",
-        "drupal/permissions_by_term": "2.25",
+        "drupal/permissions_by_term": "^3.1",
         "drupal/queue_mail": "^1.3",
         "drupal/queue_ui": "^2.1",
         "drupal/restui": "^1.20",
         "drupal/simple_ldap": "^1.0@alpha",
         "drupal/straw": "^1.3",
         "drupal/telephone_validation": "^2.2",
-        "drupal/webform_analysis": "^1.0@beta",
+        "drupal/upgrade_status": "^3.12",
+        "drupal/webform_analysis": "1.x-dev#9e34c2617958ab4b5e0632b49ca6c75d4e1d4c00",
         "drupal/webform_composite": "^1.0@RC",
         "drupal/webform_migrate": "^1.2",
         "drupal/webform_node_element": "^1.1",
         "drupal/webform_scheduled_tasks": "^2.0",
         "drupal/webform_views": "^5.0@alpha",
-        "drush/drush": "^9.0.0",
-        "os2core/os2core": "^1.0",
-        "os2forms/os2forms": "^2.8.1",
+        "drush/drush": "^10",
+        "os2core/os2core": "^2.0",
+        "os2forms/os2forms": "^3.0",
         "os2forms/os2forms_egbolig": "dev-master",
-        "os2forms/os2forms_forloeb": "^1.3",
-        "os2forms/os2forms_forloeb_profile": "^1.0",
+        "os2forms/os2forms_forloeb": "^1.9",
+        "os2forms/os2forms_forloeb_profile": "1.6.0-rc",
         "os2web/os2web_logging": "dev-master",
         "vlucas/phpdotenv": "^5.1",
-        "webflo/drupal-finder": "^1.0.0",
-        "webmozart/path-util": "^2.3",
-        "zaporylie/composer-drupal-optimizations": "^1.0"
+        "webflo/drupal-finder": "^1.2",
+        "webmozart/path-util": "^2.3"
+    },
+    "require-dev": {
+        "drupal/core-dev": "^9.1",
+        "zaporylie/composer-drupal-optimizations": "^1.2",
+        "drupal/devel": "^4.1"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -111,9 +181,20 @@
             "force-reset": true
         },
         "patches": {
+            "drupal/coc_forms_auto_export": {
+               "3240592 - Problem with phpseclib requirement in 2.x": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch"
+            },
             "drupal/webform": {
                "Add support for Set to state": "./patches/add-set-to-state-3159806-2-modified-5.19.patch"
             },
+            "drupal/webform_permissions_by_term": {
+               "3192241 - Too few arguments after Permissions by Term update to 2.28": "https://www.drupal.org/files/issues/2021-12-10/too-few-arguments-access-check_3192241-3.patch",
+               "3142184 - Automated Drupal 9 compatibility fixes": "https://www.drupal.org/files/issues/2020-06-28/webform_permissions_by_term.1.x-dev.rector.patch",
+               "Enabled D9 support": "patches/webform_permissions_by_term-d9.patch"
+            },
+            "drupal/webform_embed": {
+               "Enabled D9 support": "./patches/webform_embed-d9.patch"
+            },
             "drupal/webform_migrate": {
                 "Set to support. Checkbox condition fixes": "./patches/setto-and-checkboxes-condition-fix-onlyD7.patch"
             },