Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 24 insertions, 0 deletions

diff --git a/vendor/wikimedia/assert/composer.json b/vendor/wikimedia/assert/composer.json
new file mode 100644
index 00000000..121f7162
--- /dev/null
+++ b/vendor/wikimedia/assert/composer.json
@@ -0,0 +1,24 @@
+{
+    "name":             "wikimedia/assert",
+    "description":      "Provides runtime assertions",
+    "keywords":         ["PHP", "QA", "assert", "assertions", "precondition", "postcondition"],
+    "homepage":         "https://github.com/wmde/Assert",
+    "license":          "MIT",
+    "authors": [
+        {
+            "name":         "Daniel Kinzler"
+        }
+    ],
+
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*"
+    },
+
+    "autoload": {
+        "psr-4": {
+            "Wikimedia\\Assert\\": "src/",
+            "Wikimedia\\Assert\\Test\\": "tests/phpunit/"
+        }
+    }
+
+}