From 6ba55d78dcc786e7e4fffdb746086d8be4fbef19 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Fri, 10 Jul 2020 13:48:46 +0200
Subject: [PATCH] Add psalm as composer dependency

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
 composer.json |  5 +++--
 composer.lock | 47 +++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 27be9530b3b..088ee20e105 100644
--- a/composer.json
+++ b/composer.json
@@ -16,11 +16,12 @@
         "ext-pdo": "*"
     },
     "require-dev": {
-        "nextcloud/coding-standard": "^0.3.0"
+        "nextcloud/coding-standard": "^0.3.0",
+        "psalm/phar": "^3.12"
     },
     "scripts": {
         "cs:fix": "php-cs-fixer fix",
         "cs:check": "php-cs-fixer fix --dry-run --diff",
-        "lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/.phan/*' -print0 | xargs -0 -n1 php -l"
+        "lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/.phan/*' -not -path './build/stubs/*' -print0 | xargs -0 -n1 php -l"
     }
 }
diff --git a/composer.lock b/composer.lock
index dc8943a6de2..68eda63cb71 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": "0178ca2eb2f23b2588e729ff6a6f6c8f",
+    "content-hash": "e1676a14f39c8f5768692980f6e53dcb",
     "packages": [],
     "packages-dev": [
         {
@@ -501,6 +501,37 @@
             ],
             "time": "2018-02-15T16:58:55+00:00"
         },
+        {
+            "name": "psalm/phar",
+            "version": "3.12.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/psalm/phar.git",
+                "reference": "19957cf3088ffc9d7c02f9e692f9c0a7522fe3ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/psalm/phar/zipball/19957cf3088ffc9d7c02f9e692f9c0a7522fe3ff",
+                "reference": "19957cf3088ffc9d7c02f9e692f9c0a7522fe3ff",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "conflict": {
+                "vimeo/psalm": "*"
+            },
+            "bin": [
+                "psalm.phar"
+            ],
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Composer-based Psalm Phar",
+            "time": "2020-07-03T19:29:42+00:00"
+        },
         {
             "name": "psr/container",
             "version": "1.0.0",
@@ -1831,16 +1862,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.1.2",
+            "version": "v2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
+                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
-                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/58c7475e5457c5492c26cc740cc0ad7464be9442",
+                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442",
                 "shasum": ""
             },
             "require": {
@@ -1854,6 +1885,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.1-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -1899,7 +1934,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-20T17:43:50+00:00"
+            "time": "2020-07-06T13:23:11+00:00"
         },
         {
             "name": "symfony/stopwatch",
-- 
2.39.5