From c65573823323385ad0c0e1de72142c6b0eb2b51f Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Thu, 16 May 2019 22:49:37 +0200
Subject: [PATCH] fixed composer

---
 composer.json |  7 ++----
 composer.lock | 68 ++-------------------------------------------------
 2 files changed, 4 insertions(+), 71 deletions(-)

diff --git a/composer.json b/composer.json
index 32f89d5a..5c3b05c2 100644
--- a/composer.json
+++ b/composer.json
@@ -31,10 +31,9 @@
         "drupal/computed_field": "^2.0@beta",
         "drupal/config_split": "^1.4",
         "drupal/console": "^1.0.2",
-        "drupal/core": "8.7.*",
+        "drupal/core": "^8.7.1",
         "drupal/entity_clone": "^1.0",
         "drupal/genpass": "1.x-dev",
-        "drupal/jsonapi": "^2.4",
         "drupal/login_history": "1.x-dev",
         "drupal/mailgun": "1.x-dev",
         "drupal/mailsystem": "^4.1",
@@ -109,9 +108,7 @@
         },
         "patches": {
             "drupal/core": {
-              "migrate_drupal getsetting on null" : "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch"
-            },
-            "drupal/core": {
+              "migrate_drupal getsetting on null" : "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch",
               "ViewsEntitySchemaSubscriber should not make an entity update fail if a view cannot be resaved" : "https://www.drupal.org/files/issues/2019-05-06/3052492-11.patch"
             },
             "drupal/migrate_tools": {
diff --git a/composer.lock b/composer.lock
index c31e519f..3432e99e 100644
--- a/composer.lock
+++ b/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": "9637de17e77a13de751d76ebb87d8f35",
+    "content-hash": "bc11fe6d1de292436e12158c0c5f4099",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -4862,6 +4862,7 @@
                     "merge-extra": false
                 },
                 "patches_applied": {
+                    "migrate_drupal getsetting on null": "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch",
                     "ViewsEntitySchemaSubscriber should not make an entity update fail if a view cannot be resaved": "https://www.drupal.org/files/issues/2019-05-06/3052492-11.patch",
                     "https://www.drupal.org/project/drupal/issues/2943172": "https://www.drupal.org/files/issues/2018-07-05/2943172-kernel-test-base-3.patch"
                 }
@@ -6542,70 +6543,6 @@
                 "source": "https://git.drupalcode.org/project/interval"
             }
         },
-        {
-            "name": "drupal/jsonapi",
-            "version": "2.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupalcode.org/project/jsonapi.git",
-                "reference": "8.x-2.4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/jsonapi-8.x-2.4.zip",
-                "reference": "8.x-2.4",
-                "shasum": "5f710c1c602378748fa3b21ceec0977de62359ed"
-            },
-            "require": {
-                "drupal/core": "^8.5.11"
-            },
-            "require-dev": {
-                "drupal/schemata": "1.x-dev#8325d172e1d6880aa24073f8f751ef089282cf9a",
-                "drupal/schemata_json_schema": "*",
-                "justinrainbow/json-schema": "^5.2"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-2.4",
-                    "datestamp": "1553554702",
-                    "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0+"
-            ],
-            "authors": [
-                {
-                    "name": "Wim Leers",
-                    "homepage": "https://www.drupal.org/user/99777"
-                },
-                {
-                    "name": "dawehner",
-                    "homepage": "https://www.drupal.org/user/99340"
-                },
-                {
-                    "name": "e0ipso",
-                    "homepage": "https://www.drupal.org/user/550110"
-                },
-                {
-                    "name": "gabesullice",
-                    "homepage": "https://www.drupal.org/user/2287430"
-                }
-            ],
-            "description": "Provides a JSON API standards-compliant API for accessing and manipulating Drupal content and configuration entities.",
-            "homepage": "https://www.drupal.org/project/jsonapi",
-            "support": {
-                "source": "https://git.drupalcode.org/project/jsonapi"
-            }
-        },
         {
             "name": "drupal/kint",
             "version": "2.1.0",
@@ -16164,7 +16101,6 @@
         "drupal/domain": 20,
         "drupal/domain_alias": 20,
         "drupal/domain_config": 20,
-        "drupal/email_registration": 5,
         "drupal/entity_browser_enhanced": 5,
         "drupal/entity_clone": 15,
         "drupal/filefield_sources": 20,