(dev/core#1615) Load local copy of 'civicrm-setup' instead of downloading package

diff --git a/composer.json b/composer.json
index 22db3a163983a11a6ca04f4d50892c67ed985fb4..f4fc65c5ae1e63b0112253689106f13d68809e82 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -30,6 +30,9 @@
       "PHPUnit_": ["packages/"],
       "Civi": "",
       "Civi\\": [".", "tests/phpunit/"]
+    },
+    "psr-4": {
+      "Civi\\": ["setup/src/"]
     }
   },
   "include-path": ["vendor/tecnickcom"],
@@ -63,7 +66,6 @@
     "pear/net_smtp": "1.9.*",
     "pear/net_socket": "1.0.*",
     "pear/mail": "^1.4",
-    "civicrm/civicrm-setup": "~0.4.0",
     "guzzlehttp/guzzle": "^6.3",
     "psr/simple-cache": "~1.0.1",
     "cweagans/composer-patches": "~1.0",

diff --git a/composer.lock b/composer.lock
index 1443ab232447399f0ce1fa45cb2254c7d065eb0c..fcfc35e157e7d9588050f23f6e5de259f2a1c8d2 100644 (file)
--- 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": "705221f636824b774ef9fb35f3bfc987",
+    "content-hash": "582096c249c04484659162a3e90f7fbd",
     "packages": [
         {
             "name": "cache/integration-tests",
@@ -164,43 +164,6 @@
             "description": "RPC library for CiviConnect",
             "time": "2019-01-08T19:20:09+00:00"
         },
-        {
-            "name": "civicrm/civicrm-setup",
-            "version": "v0.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/civicrm/civicrm-setup.git",
-                "reference": "8417d0c62b6e725ef7a49a75935995d0269cbbe8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/civicrm-setup/zipball/8417d0c62b6e725ef7a49a75935995d0269cbbe8",
-                "reference": "8417d0c62b6e725ef7a49a75935995d0269cbbe8",
-                "shasum": ""
-            },
-            "require": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "^2.6.13 || ~3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "civicrm-setup-autoload.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "CiviCRM LLC",
-                    "email": "info@civicrm.org"
-                }
-            ],
-            "description": "CiviCRM installation library",
-            "time": "2020-01-18T03:46:43+00:00"
-        },
         {
             "name": "civicrm/composer-downloads-plugin",
             "version": "v2.0.0",