Browse Source

conflict composer

armansansd 2 years ago
parent
commit
7308df01d6
28 changed files with 205 additions and 1098 deletions
  1. 0 3
      composer.json
  2. 195 238
      composer.lock
  3. 0 6
      config/sync/core.extension.yml
  4. 2 0
      config/sync/matomo.settings.yml
  5. 0 8
      config/sync/migrate_drupal.settings.yml
  6. 0 47
      config/sync/migrate_plus.migration.d7_allpublicfiles.yml
  7. 0 92
      config/sync/migrate_plus.migration.d7_node_actu.yml
  8. 0 94
      config/sync/migrate_plus.migration.d7_node_evenement.yml
  9. 0 55
      config/sync/migrate_plus.migration.d7_node_programme.yml
  10. 0 90
      config/sync/migrate_plus.migration.d7_node_projet.yml
  11. 0 112
      config/sync/migrate_plus.migration.d7_node_ressource.yml
  12. 0 49
      config/sync/migrate_plus.migration.d7_node_static.yml
  13. 0 77
      config/sync/migrate_plus.migration.d7_node_theme.yml
  14. 0 43
      config/sync/migrate_plus.migration.d7_taxonomy_term_type_doc.yml
  15. 0 43
      config/sync/migrate_plus.migration.d7_taxonomy_term_type_theme.yml
  16. 0 31
      config/sync/migrate_plus.migration.d7_taxonomy_term_ville.yml
  17. 0 63
      config/sync/migrate_plus.migration.d7_users.yml
  18. 0 10
      config/sync/migrate_plus.migration_group.default.yml
  19. 0 19
      config/sync/migrate_plus.migration_group.popsu.yml
  20. 0 10
      config/sync/migrate_plus.migration_group.pospsu.yml
  21. 1 1
      config/sync/pathauto.pattern.actus.yml
  22. 1 1
      config/sync/pathauto.pattern.collections.yml
  23. 1 1
      config/sync/pathauto.pattern.events.yml
  24. 1 1
      config/sync/pathauto.pattern.programmes.yml
  25. 1 1
      config/sync/pathauto.pattern.projets.yml
  26. 1 1
      config/sync/pathauto.pattern.ressources.yml
  27. 1 1
      config/sync/pathauto.pattern.static.yml
  28. 1 1
      config/sync/pathauto.pattern.themes.yml

+ 0 - 3
composer.json

@@ -31,9 +31,6 @@
         "drupal/leaflet_more_maps": "^2.1",
         "drupal/leaflet_more_markers": "^1.1",
         "drupal/linked_field": "^1.3",
-        "drupal/migrate_devel": "2.x-dev@dev",
-        "drupal/migrate_plus": "^5.1",
-        "drupal/migrate_tools": "5.x-dev@dev",
         "drupal/page_manager": "4.x-dev@dev",
         "drupal/panelizer": "^4.4",
         "drupal/panels": "^4.6",

+ 195 - 238
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "86a7160a178fde8504984c8b1bdd01a9",
+    "content-hash": "b20308c661e56c9a2cfd1c9eb74fe3f1",
     "packages": [
         {
             "name": "ajgl/breakpoint-twig-extension",
@@ -315,27 +315,28 @@
         },
         {
             "name": "commerceguys/addressing",
-            "version": "v1.2.2",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/commerceguys/addressing.git",
-                "reference": "fb98dfc72f8a3d12fac55f69ab2477a0fbfa9860"
+                "reference": "566febd56ca71e31dd383b014c4e1bec680507bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/commerceguys/addressing/zipball/fb98dfc72f8a3d12fac55f69ab2477a0fbfa9860",
-                "reference": "fb98dfc72f8a3d12fac55f69ab2477a0fbfa9860",
+                "url": "https://api.github.com/repos/commerceguys/addressing/zipball/566febd56ca71e31dd383b014c4e1bec680507bf",
+                "reference": "566febd56ca71e31dd383b014c4e1bec680507bf",
                 "shasum": ""
             },
             "require": {
                 "doctrine/collections": "~1.0",
-                "php": ">=7.1.3"
+                "php": ">=7.3"
             },
             "require-dev": {
+                "ext-json": "*",
                 "mikey179/vfsstream": "1.*",
-                "phpunit/phpunit": "^7.5",
+                "phpunit/phpunit": "^9.5",
                 "squizlabs/php_codesniffer": "3.*",
-                "symfony/validator": "^4.4"
+                "symfony/validator": "^4.4 || ^5.4"
             },
             "suggest": {
                 "symfony/validator": "to validate addresses"
@@ -372,9 +373,9 @@
             ],
             "support": {
                 "issues": "https://github.com/commerceguys/addressing/issues",
-                "source": "https://github.com/commerceguys/addressing/tree/v1.2.2"
+                "source": "https://github.com/commerceguys/addressing/tree/v1.3.0"
             },
-            "time": "2021-10-30T12:33:41+00:00"
+            "time": "2022-04-08T13:06:51+00:00"
         },
         {
             "name": "components/highlightjs",
@@ -2660,17 +2661,17 @@
         },
         {
             "name": "drupal/autocomplete_deluxe",
-            "version": "2.0.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/autocomplete_deluxe.git",
-                "reference": "2.0.1"
+                "reference": "2.0.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/autocomplete_deluxe-2.0.1.zip",
-                "reference": "2.0.1",
-                "shasum": "244d3a1992da6ec126220bab22a933f9f6780d78"
+                "url": "https://ftp.drupal.org/files/projects/autocomplete_deluxe-2.0.2.zip",
+                "reference": "2.0.2",
+                "shasum": "d8e3a57cb02b2448685736ccd4fa0d02c5aeb689"
             },
             "require": {
                 "drupal/core": "^8 || ^9"
@@ -2678,8 +2679,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.1",
-                    "datestamp": "1630177423",
+                    "version": "2.0.2",
+                    "datestamp": "1649758219",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3147,6 +3148,7 @@
         },
         {
             "name": "drupal/config_filter",
+<<<<<<< HEAD
             "version": "1.9.0",
             "source": {
                 "type": "git",
@@ -3158,6 +3160,19 @@
                 "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.9.zip",
                 "reference": "8.x-1.9",
                 "shasum": "cf6919fc5039771f8e6c2ed203f29ab0eca8d91f"
+=======
+            "version": "2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/config_filter.git",
+                "reference": "8.x-2.3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.3.zip",
+                "reference": "8.x-2.3",
+                "shasum": "043fc712997cdd6b384024ab96bebba70e5c6b26"
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
             },
             "require": {
                 "drupal/core": "^8 || ^9"
@@ -3168,8 +3183,13 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
+<<<<<<< HEAD
                     "version": "8.x-1.9",
                     "datestamp": "1649336052",
+=======
+                    "version": "8.x-2.3",
+                    "datestamp": "1649336106",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3779,6 +3799,7 @@
         },
         {
             "name": "drupal/core",
+<<<<<<< HEAD
             "version": "9.3.9",
             "source": {
                 "type": "git",
@@ -3789,6 +3810,18 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/drupal/core/zipball/86b0c4496e20ae7f945e9a7f0404fafe191ab774",
                 "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774",
+=======
+            "version": "9.3.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/drupal/core.git",
+                "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/drupal/core/zipball/ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
+                "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
                 "shasum": ""
             },
             "require": {
@@ -4030,6 +4063,7 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
+<<<<<<< HEAD
                 "source": "https://github.com/drupal/core/tree/9.3.9"
             },
             "time": "2022-03-21T21:21:58+00:00"
@@ -4037,6 +4071,15 @@
         {
             "name": "drupal/core-composer-scaffold",
             "version": "9.3.9",
+=======
+                "source": "https://github.com/drupal/core/tree/9.3.12"
+            },
+            "time": "2022-04-20T14:25:27+00:00"
+        },
+        {
+            "name": "drupal/core-composer-scaffold",
+            "version": "9.3.12",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -4080,13 +4123,21 @@
                 "drupal"
             ],
             "support": {
+<<<<<<< HEAD
                 "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.9"
+=======
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.12"
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
             },
             "time": "2022-02-24T17:40:56+00:00"
         },
         {
             "name": "drupal/core-project-message",
+<<<<<<< HEAD
             "version": "9.3.9",
+=======
+            "version": "9.3.12",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-project-message.git",
@@ -4121,12 +4172,17 @@
                 "drupal"
             ],
             "support": {
+<<<<<<< HEAD
                 "source": "https://github.com/drupal/core-project-message/tree/9.3.9"
+=======
+                "source": "https://github.com/drupal/core-project-message/tree/9.3.12"
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
             },
             "time": "2022-02-24T17:40:56+00:00"
         },
         {
             "name": "drupal/core-recommended",
+<<<<<<< HEAD
             "version": "9.3.9",
             "source": {
                 "type": "git",
@@ -4137,6 +4193,18 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/drupal/core-recommended/zipball/3ce3f2b6145de56178e006fb2ef94089d32cf411",
                 "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411",
+=======
+            "version": "9.3.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/drupal/core-recommended.git",
+                "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
+                "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
                 "shasum": ""
             },
             "require": {
@@ -4145,7 +4213,11 @@
                 "doctrine/annotations": "1.13.2",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
+<<<<<<< HEAD
                 "drupal/core": "9.3.9",
+=======
+                "drupal/core": "9.3.12",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
                 "egulias/email-validator": "3.1.2",
                 "guzzlehttp/guzzle": "6.5.5",
                 "guzzlehttp/promises": "1.5.1",
@@ -4207,9 +4279,15 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
+<<<<<<< HEAD
                 "source": "https://github.com/drupal/core-recommended/tree/9.3.9"
             },
             "time": "2022-03-21T21:21:58+00:00"
+=======
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.12"
+            },
+            "time": "2022-04-20T14:25:27+00:00"
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
         },
         {
             "name": "drupal/cshs",
@@ -5328,8 +5406,13 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
+<<<<<<< HEAD
                     "version": "8.x-3.2",
                     "datestamp": "1628513585",
+=======
+                    "version": "8.x-3.2+7-dev",
+                    "datestamp": "1635152929",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5536,17 +5619,17 @@
         },
         {
             "name": "drupal/geocoder",
-            "version": "3.25.0",
+            "version": "3.26.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/geocoder.git",
-                "reference": "8.x-3.25"
+                "reference": "8.x-3.26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-3.25.zip",
-                "reference": "8.x-3.25",
-                "shasum": "959dd2df6c17eaa0550ecb3943f06bb77d1d3adc"
+                "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-3.26.zip",
+                "reference": "8.x-3.26",
+                "shasum": "77aadfd0b8ec8601b681e70866545a7b3899756f"
             },
             "require": {
                 "davedevelopment/stiphle": "^0.9.2",
@@ -5561,6 +5644,7 @@
                 "drupal/coder": "^8.2",
                 "drupal/geocoder_field": "*",
                 "drupal/geofield": "*",
+                "geo6/geocoder-php-addok-provider": "^1.0",
                 "geo6/geocoder-php-bpost-provider": "^1.3.0",
                 "geo6/geocoder-php-geopunt-provider": "^1.0",
                 "geo6/geocoder-php-spw-provider": "^1.0",
@@ -5592,8 +5676,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-3.25",
-                    "datestamp": "1642803151",
+                    "version": "8.x-3.26",
+                    "datestamp": "1649610015",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5662,17 +5746,17 @@
         },
         {
             "name": "drupal/geofield",
-            "version": "1.38.0",
+            "version": "1.39.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/geofield.git",
-                "reference": "8.x-1.38"
+                "reference": "8.x-1.39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.38.zip",
-                "reference": "8.x-1.38",
-                "shasum": "a41ce66e4aab2c266a8e9f0addcac68a0b76f44b"
+                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.39.zip",
+                "reference": "8.x-1.39",
+                "shasum": "7afd4bb32c21e7bf84568ecc0c1403a3541c2837"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9",
@@ -5681,8 +5765,9 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.38",
-                    "datestamp": "1646604411",
+
+                    "version": "8.x-1.39",
+                    "datestamp": "1649534200",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -7131,6 +7216,7 @@
         },
         {
             "name": "drupal/matomo",
+<<<<<<< HEAD
             "version": "1.17.0",
             "source": {
                 "type": "git",
@@ -7142,6 +7228,19 @@
                 "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.17.zip",
                 "reference": "8.x-1.17",
                 "shasum": "091f946ec7a09d6b4463e5d75adca9cdcdff2918"
+=======
+            "version": "1.18.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/matomo.git",
+                "reference": "8.x-1.18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.18.zip",
+                "reference": "8.x-1.18",
+                "shasum": "ad0d24ba12bca16e666a5f9d404cd56926839169"
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
             },
             "require": {
                 "drupal/core": "^8.8.0 || ^9.0.0"
@@ -7157,8 +7256,13 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
+<<<<<<< HEAD
                     "version": "8.x-1.17",
                     "datestamp": "1647206848",
+=======
+                    "version": "8.x-1.18",
+                    "datestamp": "1649792938",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -7432,201 +7536,6 @@
                 "issues": "https://www.drupal.org/project/issues/menu_position"
             }
         },
-        {
-            "name": "drupal/migrate_devel",
-            "version": "dev-2.x",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupalcode.org/project/migrate_devel.git",
-                "reference": "c60d049d91389bde0cc5368fabfda24c5eb61780"
-            },
-            "require": {
-                "drupal/core": "^8 || ^9"
-            },
-            "conflict": {
-                "drush/drush": "<9"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-2.0-alpha1+3-dev",
-                    "datestamp": "1592898665",
-                    "security-coverage": {
-                        "status": "not-covered",
-                        "message": "Dev releases are not covered by Drupal security advisories."
-                    }
-                },
-                "drush": {
-                    "services": {
-                        "drush.services.yml": "^9"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Derimagia",
-                    "homepage": "https://www.drupal.org/user/819640"
-                },
-                {
-                    "name": "aczietlow",
-                    "homepage": "https://www.drupal.org/user/1616656"
-                },
-                {
-                    "name": "andrewmacpherson",
-                    "homepage": "https://www.drupal.org/user/265648"
-                }
-            ],
-            "description": "Migrate Development Tools",
-            "homepage": "https://www.drupal.org/project/migrate_devel",
-            "support": {
-                "source": "https://git.drupalcode.org/project/migrate_devel",
-                "issues": "https://www.drupal.org/project/issues/migrate_devel"
-            }
-        },
-        {
-            "name": "drupal/migrate_plus",
-            "version": "5.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupalcode.org/project/migrate_plus.git",
-                "reference": "8.x-5.2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/migrate_plus-8.x-5.2.zip",
-                "reference": "8.x-5.2",
-                "shasum": "03ae34c362ccfacc4ae95b58469b25522e0ffb68"
-            },
-            "require": {
-                "drupal/core": "^9.1"
-            },
-            "require-dev": {
-                "drupal/migrate_example_advanced_setup": "*",
-                "drupal/migrate_example_setup": "*",
-                "drush/drush": "^10"
-            },
-            "suggest": {
-                "ext-soap": "*",
-                "sainsburys/guzzle-oauth2-plugin": "3.0 required for the OAuth2 authentication plugin"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "drupal": {
-                    "version": "8.x-5.2",
-                    "datestamp": "1641478565",
-                    "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
-                    }
-                },
-                "drush": {
-                    "services": {
-                        "drush.services.yml": "^9 || ^10"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Mike Ryan",
-                    "homepage": "https://www.drupal.org/u/mikeryan",
-                    "role": "Maintainer"
-                },
-                {
-                    "name": "Lucas Hedding",
-                    "homepage": "https://www.drupal.org/u/heddn",
-                    "role": "Maintainer"
-                },
-                {
-                    "name": "mikeryan",
-                    "homepage": "https://www.drupal.org/user/4420"
-                }
-            ],
-            "description": "Enhancements to core migration support.",
-            "homepage": "https://www.drupal.org/project/migrate_plus",
-            "support": {
-                "source": "https://git.drupalcode.org/project/migrate_plus",
-                "issues": "https://www.drupal.org/project/issues/migrate_plus",
-                "slack": "#migrate"
-            }
-        },
-        {
-            "name": "drupal/migrate_tools",
-            "version": "dev-5.x",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupalcode.org/project/migrate_tools.git",
-                "reference": "310ddce63f0d7e0b08b0f1979db0c55012ce0fb7"
-            },
-            "require": {
-                "drupal/core": "^9.1",
-                "drupal/migrate_plus": "^5",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "drupal/migrate_source_csv": "^3.0",
-                "drush/drush": "^10"
-            },
-            "suggest": {
-                "drush/drush": "^9 || ^10"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "branch-alias": {
-                    "dev-5.x": "5.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-5.1+2-dev",
-                    "datestamp": "1644356540",
-                    "security-coverage": {
-                        "status": "not-covered",
-                        "message": "Dev releases are not covered by Drupal security advisories."
-                    }
-                },
-                "drush": {
-                    "services": {
-                        "drush.services.yml": "^9 || ^10"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Mike Ryan",
-                    "homepage": "https://www.drupal.org/u/mikeryan",
-                    "role": "Maintainer"
-                },
-                {
-                    "name": "Lucas Hedding",
-                    "homepage": "https://www.drupal.org/u/heddn",
-                    "role": "Maintainer"
-                },
-                {
-                    "name": "mikeryan",
-                    "homepage": "https://www.drupal.org/user/4420"
-                }
-            ],
-            "description": "Tools to assist in developing and running migrations.",
-            "homepage": "http://drupal.org/project/migrate_tools",
-            "support": {
-                "source": "https://git.drupalcode.org/project/migrate_tools",
-                "issues": "https://www.drupal.org/project/issues/migrate_tools",
-                "slack": "#migrate"
-            }
-        },
         {
             "name": "drupal/page_manager",
             "version": "dev-4.x",
@@ -7646,8 +7555,8 @@
                     "dev-8.x-4.x": "4.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-4.0-beta6+1-dev",
-                    "datestamp": "1613459893",
+                    "version": "8.x-4.0-beta6+2-dev",
+                    "datestamp": "1631999122",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Project has not opted into security advisory coverage!"
@@ -7988,7 +7897,11 @@
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/paragraphs.git",
+<<<<<<< HEAD
                 "reference": "80e4c5bfbfbf27d4cb59a228c0011ce81496ba76"
+=======
+                "reference": "6a75a6148bc31ffc5662c9a8130d32ec16aaaf6f"
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
             },
             "require": {
                 "drupal/core": "^9.2",
@@ -8016,8 +7929,13 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
+<<<<<<< HEAD
                     "version": "8.x-1.13+5-dev",
                     "datestamp": "1646129836",
+=======
+                    "version": "8.x-1.13+11-dev",
+                    "datestamp": "1650520402",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Dev releases are not covered by Drupal security advisories."
@@ -8111,17 +8029,17 @@
         },
         {
             "name": "drupal/pathauto",
-            "version": "1.9.0",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/pathauto.git",
-                "reference": "8.x-1.9"
+                "reference": "8.x-1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.9.zip",
-                "reference": "8.x-1.9",
-                "shasum": "f075ebff595c9b8b62333d65ad29020330e0ea9d"
+                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.10.zip",
+                "reference": "8.x-1.10",
+                "shasum": "f49d5fbcd7a2c1b4de1da07194fe01d9012237ec"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9",
@@ -8134,8 +8052,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.9",
-                    "datestamp": "1644822949",
+                    "version": "8.x-1.10",
+                    "datestamp": "1650806739",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -9555,6 +9473,7 @@
         },
         {
             "name": "drupal/views_bulk_operations",
+<<<<<<< HEAD
             "version": "3.13.0",
             "source": {
                 "type": "git",
@@ -9566,9 +9485,22 @@
                 "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.13.zip",
                 "reference": "8.x-3.13",
                 "shasum": "70583d08b91be3b5e008f571589425c2176eb73b"
+=======
+            "version": "4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/views_bulk_operations.git",
+                "reference": "4.1.2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.1.2.zip",
+                "reference": "4.1.2",
+                "shasum": "1cfa10f755240cae46de8d8684272a9a8907a730"
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
             },
             "require": {
-                "drupal/core": "^8.8 || ^9"
+                "drupal/core": "^9"
             },
             "require-dev": {
                 "drush/drush": "^10"
@@ -9579,8 +9511,13 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
+<<<<<<< HEAD
                     "version": "8.x-3.13",
                     "datestamp": "1619697066",
+=======
+                    "version": "4.1.2",
+                    "datestamp": "1647943086",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -12373,6 +12310,7 @@
         },
         {
             "name": "psy/psysh",
+<<<<<<< HEAD
             "version": "v0.10.12",
             "source": {
                 "type": "git",
@@ -12383,6 +12321,18 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
                 "reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
+=======
+            "version": "v0.11.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bobthecow/psysh.git",
+                "reference": "7f7da640d68b9c9fec819caae7c744a213df6514"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7f7da640d68b9c9fec819caae7c744a213df6514",
+                "reference": "7f7da640d68b9c9fec819caae7c744a213df6514",
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
                 "shasum": ""
             },
             "require": {
@@ -12393,6 +12343,9 @@
                 "symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10",
                 "symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7"
             },
+            "conflict": {
+                "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4"
+            },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.2",
                 "hoa/console": "3.17.*"
@@ -12442,9 +12395,15 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
+<<<<<<< HEAD
                 "source": "https://github.com/bobthecow/psysh/tree/v0.10.12"
             },
             "time": "2021-11-30T14:05:36+00:00"
+=======
+                "source": "https://github.com/bobthecow/psysh/tree/v0.11.2"
+            },
+            "time": "2022-02-28T15:28:54+00:00"
+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
         },
         {
             "name": "ralouphie/getallheaders",
@@ -15919,8 +15878,6 @@
         "drupal/address": 20,
         "drupal/administerusersbyrole": 20,
         "drupal/better_exposed_filters": 10,
-        "drupal/migrate_devel": 20,
-        "drupal/migrate_tools": 20,
         "drupal/page_manager": 20,
         "drupal/paragraphs": 20,
         "drupal/perimeter": 20,

+ 0 - 6
config/sync/core.extension.yml

@@ -95,11 +95,6 @@ module:
   menu_block: 0
   menu_link_content: 0
   menu_ui: 0
-  migrate: 0
-  migrate_devel: 0
-  migrate_drupal: 0
-  migrate_plus: 0
-  migrate_tools: 0
   node: 0
   options: 0
   page_cache: 0
@@ -116,7 +111,6 @@ module:
   perimeter: 0
   persistent_login: 0
   popsu_link_block: 0
-  popsu_migrate: 0
   popsu_programme: 0
   redirect: 0
   redis: 0

+ 2 - 0
config/sync/matomo.settings.yml

@@ -36,3 +36,5 @@ translation_set: false
 cache: false
 page_title_hierarchy: false
 page_title_hierarchy_exclude_home: true
+disable_tracking: false
+status_codes_disabled: {  }

+ 0 - 8
config/sync/migrate_drupal.settings.yml

@@ -1,8 +0,0 @@
-_core:
-  default_config_hash: 1daEO2inZc1i3d0Sn-ADIq9mUIU7tSLCxn579NT6f2g
-langcode: fr
-enforce_source_module_tags:
-  - 'Drupal 6'
-  - 'Drupal 7'
-follow_up_migration_tags:
-  - 'Follow-up migration'

+ 0 - 47
config/sync/migrate_plus.migration.d7_allpublicfiles.yml

@@ -1,47 +0,0 @@
-uuid: f5398c96-5eb8-4e71-abad-0293ecdbf0d5
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Y-MrRS7-axq8h57tbPZAD5kWEoD7HyDvUcXUMYo5Osw
-id: d7_allpublicfiles
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-  - Files
-migration_group: popsu
-label: 'Public files'
-source:
-  plugin: d7_pubic_file
-  batch_size: 5000
-  scheme: public
-  constants:
-    source_base_path: ../../d7
-process:
-  filename: filename
-  source_full_path:
-    -
-      plugin: concat
-      delimiter: /
-      source:
-        - constants/source_base_path
-        - filepath
-    -
-      plugin: urlencode
-  uri:
-    plugin: file_copy
-    source:
-      - '@source_full_path'
-      - uri
-  filemime: filemime
-  status: status
-  created: timestamp
-  changed: timestamp
-  uid: uid
-destination:
-  plugin: 'entity:file'
-migration_dependencies: null

+ 0 - 92
config/sync/migrate_plus.migration.d7_node_actu.yml

@@ -1,92 +0,0 @@
-uuid: 6bffa575-73c1-40dc-8cfc-e925ef8b34f6
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: I6GROOhFniRjxHdI9dtO9yVSViggMTS5H7jUOHZEMIU
-id: d7_node_actu
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'Node actu'
-source:
-  plugin: d7_node_actu
-  batch_size: 500
-process:
-  type:
-    plugin: default_value
-    default_value: actualite
-  created: created
-  changed: changed
-  uid:
-    plugin: default_value
-    default_value: 34
-  title: title
-  field_sous_titre: field_popsu_actu_soustitre
-  promote:
-    plugin: default_value
-    default_value: 0
-    source: field_popsu_actu_enhome
-  field_dates_actu:
-    -
-      plugin: skip_on_empty
-      method: process
-      source: field_date
-    -
-      plugin: sub_process
-      process:
-        value:
-          plugin: format_date
-          from_format: 'Y-m-d H:i:s'
-          to_format: 'Y-m-d\TH:i:s'
-          source: value
-        end_value:
-          plugin: format_date
-          from_format: 'Y-m-d H:i:s'
-          to_format: 'Y-m-d\TH:i:s'
-          source: end
-        timezone:
-          plugin: default_value
-          default_value: ''
-  body:
-    plugin: sub_process
-    source: field_popsu_actu_body
-    process:
-      value: value
-      summary: summary
-      format:
-        plugin: default_value
-        default_value: wysiwyg
-  field_fichier:
-    plugin: sub_process
-    source: field_popsu_actu_attachment
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_allpublicfiles
-        source: fid
-        no_stub: true
-      display: display
-      description: description
-  field_image:
-    plugin: sub_process
-    source: field_popsu_actu_image
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_allpublicfiles
-        source: fid
-        no_stub: true
-      alt: alt
-      title: title
-  field_memo: field_memo
-destination:
-  plugin: 'entity:node'
-migration_dependencies:
-  required:
-    - d7_allpublicfiles

+ 0 - 94
config/sync/migrate_plus.migration.d7_node_evenement.yml

@@ -1,94 +0,0 @@
-uuid: c5be4497-3534-4b2d-a962-8ff469086c65
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: MS8tsr-1_51NXldBPGyjMyJ0FirHg8jPH3btyD9bWbM
-id: d7_node_evenement
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'Node evenement'
-source:
-  plugin: d7_node_evenement
-  batch_size: 500
-process:
-  type:
-    plugin: default_value
-    default_value: evenement
-  created: created
-  changed: changed
-  uid:
-    plugin: default_value
-    default_value: 34
-  title: title
-  field_programme:
-    plugin: sub_process
-    source: field_programme
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_node_programme
-        source: nid
-        no_stub: true
-  field_theme:
-    plugin: migration_lookup
-    migration: d7_node_theme
-    source: field_theme
-    no_stub: true
-  field_projet:
-    plugin: migration_lookup
-    migration: d7_node_projet
-    source: field_projet
-    no_stub: true
-  field_sous_titre: field_popsu_colloque_subtitle
-  field_intro:
-    plugin: sub_process
-    source: field_popsu_colloque_subtitle2
-    process:
-      value: value
-      summary: summary
-      format:
-        plugin: default_value
-        default_value: wysiwyg
-  body:
-    plugin: sub_process
-    source: body
-    process:
-      value: value
-      summary: summary
-      format:
-        plugin: default_value
-        default_value: wysiwyg
-  field_image:
-    plugin: sub_process
-    source: field_popsu_colloque_imageintro
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_allpublicfiles
-        source: fid
-        no_stub: true
-      alt: alt
-      title: title
-  field_ressources_liees:
-    plugin: migration_lookup
-    migration: d7_node_ressource
-    source: field_ressource
-    no_stub: true
-  field_evenements_liees:
-    plugin: migration_lookup
-    migration: d7_node_evenement
-    source: field_evenement
-    no_stub: true
-  field_memo: field_memo
-destination:
-  plugin: 'entity:node'
-migration_dependencies:
-  required:
-    - d7_allpublicfiles

+ 0 - 55
config/sync/migrate_plus.migration.d7_node_programme.yml

@@ -1,55 +0,0 @@
-uuid: 526be06c-1d07-4a62-8e15-04607ac1786e
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: hReXJPChx1-JDHxXfJv4p1KrR6w_DmrgLrGrpfCN63U
-id: d7_node_programme
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'Node Programme'
-source:
-  plugin: d7_node_programme
-  node_type: popsu_special
-  batch_size: 500
-process:
-  type:
-    plugin: default_value
-    default_value: programme
-  created: created
-  changed: changed
-  uid:
-    plugin: default_value
-    default_value: 34
-  title: term_title
-  body/value: body
-  body/summary: body_summary
-  body/format:
-    plugin: default_value
-    default_value: wysiwyg
-  field_textes: text_paragraphe
-  field_sous_parties: sous_parties
-  field_partenaires: partenaires
-  field_fichier:
-    plugin: sub_process
-    source: fichiers
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_allpublicfiles
-        source: fid
-        no_stub: true
-      display: display
-      description: description
-destination:
-  plugin: 'entity:node'
-migration_dependencies:
-  required:
-    - d7_allpublicfiles
-    - d7_users

+ 0 - 90
config/sync/migrate_plus.migration.d7_node_projet.yml

@@ -1,90 +0,0 @@
-uuid: 22846501-8036-471e-b1fe-03dcb7f61f6a
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: wqaarb_cUDcSKyJ9UWM8yAPYiqM0-xAMyu9bfzI7jUA
-id: d7_node_projet
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'Node Projet'
-source:
-  plugin: d7_node_projet
-  batch_size: 500
-process:
-  type:
-    plugin: default_value
-    default_value: projet
-  created: created
-  changed: changed
-  uid:
-    plugin: default_value
-    default_value: 34
-  title: title
-  field_ville:
-    plugin: migration_lookup
-    migration: d7_taxonomy_term_ville
-    source: ville
-    no_stub: true
-  field_programme:
-    plugin: sub_process
-    source: field_programme
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_node_programme
-        source: nid
-        no_stub: true
-  field_comparatifs_associes:
-    plugin: sub_process
-    source: field_comparatifs_associes
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_node_theme
-        source: nid
-  field_themes_lies:
-    plugin: sub_process
-    source: field_themes_lies
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_node_theme
-        source: nid
-  field_projets_lies:
-    plugin: sub_process
-    source: field_projets_lies
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_node_projet
-        source: nid
-  body: body
-  field_diaporama:
-    plugin: sub_process
-    source: diaporama
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_allpublicfiles
-        source: fid
-        no_stub: true
-      alt: alt
-      title: title
-  field_textes: field_textes
-  field_equipes: field_equipes
-  field_partenaires: field_partenaires
-  field_memo: field_memo
-destination:
-  plugin: 'entity:node'
-migration_dependencies:
-  required:
-    - d7_allpublicfiles
-    - d7_users
-    - d7_taxonomy_term_type_theme

+ 0 - 112
config/sync/migrate_plus.migration.d7_node_ressource.yml

@@ -1,112 +0,0 @@
-uuid: bb4b4a23-a883-456f-b89f-5c7b598a4247
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: tVxq-4dg-JkKcB01hEZQrxTk3VUApI6tXnH6vEeDdmc
-id: d7_node_ressource
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'Node Ressource'
-source:
-  plugin: d7_node_ressource
-  batch_size: 500
-process:
-  type:
-    plugin: default_value
-    default_value: ressource
-  created: created
-  changed: changed
-  uid:
-    plugin: default_value
-    default_value: 34
-  title: title
-  field_programme:
-    plugin: sub_process
-    source: field_programme
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_node_programme
-        source: nid
-        no_stub: true
-  field_theme:
-    plugin: migration_lookup
-    migration: d7_node_theme
-    source: field_theme
-    no_stub: true
-  field_projet:
-    plugin: migration_lookup
-    migration: d7_node_projet
-    source: field_projet
-    no_stub: true
-  field_poid: field_poids
-  field_type_de_ressource:
-    plugin: migration_lookup
-    migration: d7_taxonomy_term_type_doc
-    source: field_popsu_doc_type
-    no_stub: true
-  field_sous_titre:
-    plugin: sub_process
-    source: field_popsu_publication_soustitr
-    process:
-      value: value
-  field_edition:
-    plugin: sub_process
-    source: field_popsu_doc_source
-    process:
-      value: value
-      summary: summary
-      format:
-        plugin: default_value
-        default_value: wysiwyg
-  body:
-    plugin: sub_process
-    source: body
-    process:
-      value: value
-      summary: summary
-      format:
-        plugin: default_value
-        default_value: wysiwyg
-  field_image:
-    plugin: sub_process
-    source: field_popsu_publication_cover
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_allpublicfiles
-        source: fid
-        no_stub: true
-      alt: alt
-      title: title
-  field_fichier:
-    plugin: sub_process
-    source: field_popsu_doc_files
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_allpublicfiles
-        source: fid
-        no_stub: true
-      display: display
-      description: description
-  field_ressources_liees:
-    plugin: migration_lookup
-    migration: d7_node_ressource
-    source: field_ressources_liees
-    no_stub: true
-  field_memo: field_memo
-destination:
-  plugin: 'entity:node'
-migration_dependencies:
-  required:
-    - d7_allpublicfiles
-    - d7_users
-    - d7_taxonomy_term_type_doc

+ 0 - 49
config/sync/migrate_plus.migration.d7_node_static.yml

@@ -1,49 +0,0 @@
-uuid: 92e4c3e2-f333-486a-84f2-f0083d4b2191
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: giLUW65Fkj4Orn9QcEvs9tTY5s_MZ66ETkDLSoU8btk
-id: d7_node_static
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'Node Static'
-source:
-  plugin: d7_node_static
-  batch_size: 500
-process:
-  type:
-    plugin: default_value
-    default_value: static
-  created: created
-  changed: changed
-  uid:
-    plugin: default_value
-    default_value: 34
-  title: title
-  field_textes: field_textes
-  field_pieces_jointes:
-    plugin: sub_process
-    source: field_popsu_pageneutral_insert
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_allpublicfiles
-        source: fid
-        no_stub: true
-      display: display
-      description: description
-  field_memo: field_memo
-destination:
-  plugin: 'entity:node'
-migration_dependencies:
-  required:
-    - d7_allpublicfiles
-    - d7_users
-    - d7_taxonomy_term_type_theme

+ 0 - 77
config/sync/migrate_plus.migration.d7_node_theme.yml

@@ -1,77 +0,0 @@
-uuid: 4130b789-2953-4235-a533-3f8c30564200
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: V-L_tGNdTgcQEXyapB6I9t2Wg7w7xq5RapuQ8kAbE2U
-id: d7_node_theme
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'Node Theme'
-source:
-  plugin: d7_node_theme
-  batch_size: 500
-process:
-  type:
-    plugin: default_value
-    default_value: theme
-  created: created
-  changed: changed
-  uid:
-    plugin: default_value
-    default_value: 34
-  title: title
-  field_programme:
-    plugin: migration_lookup
-    migration: d7_node_programme
-    source: programme
-    no_stub: true
-  field_image:
-    plugin: sub_process
-    source: images
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_allpublicfiles
-        source: fid
-        no_stub: true
-      alt: alt
-      title: title
-  field_type_de_theme:
-    plugin: migration_lookup
-    migration: d7_taxonomy_term_type_theme
-    source: field_popsu_themtrans_type
-    no_stub: true
-  field_themes_lies:
-    plugin: sub_process
-    source: field_themes_lies
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_node_theme
-        source: nid
-  field_projets_lies:
-    plugin: sub_process
-    source: field_projets_lies
-    process:
-      target_id:
-        plugin: migration_lookup
-        migration: d7_node_projet
-        source: nid
-  field_textes: field_textes
-  field_equipes: field_equipes
-  field_partenaires: field_partenaires
-  field_memo: field_memo
-destination:
-  plugin: 'entity:node'
-migration_dependencies:
-  required:
-    - d7_allpublicfiles
-    - d7_users
-    - d7_taxonomy_term_type_theme

+ 0 - 43
config/sync/migrate_plus.migration.d7_taxonomy_term_type_doc.yml

@@ -1,43 +0,0 @@
-uuid: 7a786019-2d8d-421c-abf1-ae1a1e314cbc
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: DR4n-aywyhGhgNbB33VfN1yxn9_ePqV0HV9vjt45Gdg
-id: d7_taxonomy_term_type_doc
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'Taxonomy terms Type de Document'
-source:
-  plugin: d7_taxoterm_typedoc
-  bundle: popsu_documents_type
-process:
-  vid:
-    plugin: default_value
-    default_value: types_de_document
-  name: name
-  description/value: description
-  description/format: format
-  weight: weight
-  parent_id:
-    -
-      plugin: skip_on_empty
-      method: process
-      source: parent
-    -
-      plugin: migration_lookup
-      migration: d7_taxonomy_term_type_doc
-  parent:
-    plugin: default_value
-    default_value: 0
-    source: '@parent_id'
-  changed: timestamp
-destination:
-  plugin: 'entity:taxonomy_term'
-migration_dependencies: null

+ 0 - 43
config/sync/migrate_plus.migration.d7_taxonomy_term_type_theme.yml

@@ -1,43 +0,0 @@
-uuid: 5702253f-585d-4097-b2bc-5a602c2d2dfd
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 8WKuGBlZ5qPBjASOe5KMfJVNAdp2h7h-cu46cvt-Q-s
-id: d7_taxonomy_term_type_theme
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'Taxonomy terms Type de theme'
-source:
-  plugin: d7_taxoterm_typetheme
-  bundle: popsu_themtrans
-process:
-  vid:
-    plugin: default_value
-    default_value: types_de_theme
-  name: name
-  description/value: description
-  description/format: format
-  weight: weight
-  parent_id:
-    -
-      plugin: skip_on_empty
-      method: process
-      source: parent
-    -
-      plugin: migration_lookup
-      migration: d7_taxonomy_term_type_theme
-  parent:
-    plugin: default_value
-    default_value: 0
-    source: '@parent_id'
-  changed: timestamp
-destination:
-  plugin: 'entity:taxonomy_term'
-migration_dependencies: null

+ 0 - 31
config/sync/migrate_plus.migration.d7_taxonomy_term_ville.yml

@@ -1,31 +0,0 @@
-uuid: 427ae68d-1c7b-4aa3-be93-a90fd754de1c
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: AIo0rBvn1SeEsRPJ_R1KmTG4Rm7rDPpPQCqU6gLUmTA
-id: d7_taxonomy_term_ville
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'Taxonomy terms Villes'
-source:
-  plugin: d7_taxoterm_ville
-  bundle: popsu_villes
-process:
-  vid:
-    plugin: default_value
-    default_value: villes
-  name: name
-  description/value: description
-  description/format: format
-  weight: weight
-  changed: timestamp
-destination:
-  plugin: 'entity:taxonomy_term'
-migration_dependencies: null

+ 0 - 63
config/sync/migrate_plus.migration.d7_users.yml

@@ -1,63 +0,0 @@
-uuid: ab689e06-9590-41ed-aae5-86c0b58a7cbb
-langcode: fr
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: mR9tehyJ35Hg9p6fRCGwtr-Whd1VHnD1_F-M9944bxc
-id: d7_users
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - 'Drupal 7'
-  - Content
-  - Popsu
-migration_group: popsu
-label: 'User accounts'
-source:
-  plugin: d7_users
-  batch_size: 1000
-process:
-  name: name
-  pass: pass
-  mail:
-    -
-      plugin: skip_on_value
-      equals: true
-      source: mail
-      method: row
-      value:
-        - manager-popsu@renaud-cuny.com
-    -
-      plugin: default_value
-      source: mail
-      default_value: null
-  created: created
-  access: access
-  login: login
-  status: status
-  timezone: timezone
-  init: init
-  roles:
-    -
-      plugin: skip_on_value
-      equals: true
-      source: roles
-      method: row
-      value:
-        - 5
-    -
-      plugin: static_map
-      source: roles
-      default_value: 2
-      map:
-        1: anonymous
-        2: authenticated
-        3: admin
-        4: editeur
-        5: root
-destination:
-  plugin: 'entity:user'
-migration_dependencies:
-  required:
-    - d7_allpublicfiles

+ 0 - 10
config/sync/migrate_plus.migration_group.default.yml

@@ -1,10 +0,0 @@
-uuid: 713c224d-0d68-4308-a3c8-8c2dad1ddd68
-langcode: fr
-status: true
-dependencies: {  }
-id: default
-label: Default
-description: 'A container for any migrations not explicitly assigned to a group.'
-source_type: null
-module: null
-shared_configuration: null

+ 0 - 19
config/sync/migrate_plus.migration_group.popsu.yml

@@ -1,19 +0,0 @@
-uuid: 487437dd-473a-44b4-9efd-b3843b07811c
-langcode: fr
-status: true
-dependencies:
-  enforced:
-    module:
-      - migrate_plus
-      - migrate_tools
-      - popsu_migrate
-_core:
-  default_config_hash: YhnQU3F8lPdbbELyS9OFdE75LcwJic6bpYqxKXI6Wd0
-id: popsu
-label: Popsu
-description: 'Drupal 7 popsu content migration to Drupal 9.'
-source_type: 'Drupal 7'
-module: null
-shared_configuration:
-  source:
-    key: popsu_d7

+ 0 - 10
config/sync/migrate_plus.migration_group.pospsu.yml

@@ -1,10 +0,0 @@
-uuid: b23aa4de-a0e2-4988-8e48-136de4554664
-langcode: fr
-status: true
-dependencies: {  }
-id: pospsu
-label: pospsu
-description: ''
-source_type: null
-module: null
-shared_configuration: null

+ 1 - 1
config/sync/pathauto.pattern.actus.yml

@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'actualite/[node:title]'
 selection_criteria:
   c4ce3a75-84d0-47ca-b951-56dff1374b74:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: c4ce3a75-84d0-47ca-b951-56dff1374b74
     context_mapping:

+ 1 - 1
config/sync/pathauto.pattern.collections.yml

@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'collection/[node:title]'
 selection_criteria:
   552be6b5-aae3-4bbf-a988-e435ba967205:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: 552be6b5-aae3-4bbf-a988-e435ba967205
     context_mapping:

+ 1 - 1
config/sync/pathauto.pattern.events.yml

@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'evenement/[node:title]'
 selection_criteria:
   b54bd1e2-665b-41f5-85db-fb94fd8e4cd8:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: b54bd1e2-665b-41f5-85db-fb94fd8e4cd8
     context_mapping:

+ 1 - 1
config/sync/pathauto.pattern.programmes.yml

@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'programme/[node:title]'
 selection_criteria:
   0d4e18f8-03dc-4648-8350-9cf896e2d2a6:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: 0d4e18f8-03dc-4648-8350-9cf896e2d2a6
     context_mapping:

+ 1 - 1
config/sync/pathauto.pattern.projets.yml

@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'projet/[node:title]'
 selection_criteria:
   f6c99817-1439-4169-897e-79179fc7403b:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: f6c99817-1439-4169-897e-79179fc7403b
     context_mapping:

+ 1 - 1
config/sync/pathauto.pattern.ressources.yml

@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'ressource/[node:title]'
 selection_criteria:
   eb7c634d-7952-41e7-8d95-b83c26b3e1f3:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: eb7c634d-7952-41e7-8d95-b83c26b3e1f3
     context_mapping:

+ 1 - 1
config/sync/pathauto.pattern.static.yml

@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: '[node:title]'
 selection_criteria:
   6656a141-75db-4226-be69-b4611e909af3:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: 6656a141-75db-4226-be69-b4611e909af3
     context_mapping:

+ 1 - 1
config/sync/pathauto.pattern.themes.yml

@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'theme/[node:title]'
 selection_criteria:
   d9172412-a0bf-4780-a0dd-4a114696f3b0:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: d9172412-a0bf-4780-a0dd-4a114696f3b0
     context_mapping: