From 52cb565eef626c45ad01d91a2e1cde5e2a210281 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 7 Sep 2020 11:23:37 +0200
Subject: [PATCH] [ticket/16587] Remove Doctum from composer.json

PHPBB3-16587

[ticket/16587] Adjust composer.lock changes to only removal of sami

PHPBB3-16587
---
 phpBB/composer.json |  3 +-
 phpBB/composer.lock | 67 ++-------------------------------------------
 2 files changed, 3 insertions(+), 67 deletions(-)

diff --git a/phpBB/composer.json b/phpBB/composer.json
index d96d4e7c45..31ad38a6b4 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -60,8 +60,7 @@
 		"squizlabs/php_codesniffer": "~3.4",
 		"symfony/browser-kit": "~3.4",
 		"symfony/css-selector": "~3.4",
-		"symfony/dom-crawler": "~3.4",
-		"sami/sami": "^4.1"
+		"symfony/dom-crawler": "~3.4"
 	},
 	"extra": {
 		"branch-alias": {
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 98f3fd9d61..6cf9905272 100644
--- a/phpBB/composer.lock
+++ b/phpBB/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": "37203017dcb25b6276aa604eb4bcf44e",
+    "content-hash": "0f581b60e2cd68bdf647e0746ef37bff",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",
@@ -337,7 +337,7 @@
                 "oauth",
                 "security"
             ],
-            "time": "2018-02-14T22:37:14+00:00"
+            "time": "2016-07-12T22:15:00+00:00"
         },
         {
             "name": "marc1706/fast-image-size",
@@ -3996,69 +3996,6 @@
             ],
             "time": "2018-01-21T07:42:36+00:00"
         },
-        {
-            "name": "sami/sami",
-            "version": "v4.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FriendsOfPHP/Sami.git",
-                "reference": "19b8a82b858bd31544c468317c8307188ccb4022"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/Sami/zipball/19b8a82b858bd31544c468317c8307188ccb4022",
-                "reference": "19b8a82b858bd31544c468317c8307188ccb4022",
-                "shasum": ""
-            },
-            "require": {
-                "blackfire/php-sdk": "^1.5.18",
-                "michelf/php-markdown": "~1.3",
-                "nikic/php-parser": "~3.0",
-                "php": "^7.1.3",
-                "phpdocumentor/reflection-docblock": "~2.0",
-                "pimple/pimple": "~3.0",
-                "symfony/console": "~3.0|~4.0",
-                "symfony/filesystem": "~3.0|~4.0",
-                "symfony/finder": "~3.0|~4.0",
-                "symfony/process": "~3.0|~4.0",
-                "symfony/yaml": "~3.0|~4.0",
-                "twig/twig": "~2.0"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~4.0"
-            },
-            "bin": [
-                "sami.php"
-            ],
-            "type": "application",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Sami\\": "Sami/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Sami, an API documentation generator",
-            "homepage": "http://sami.sensiolabs.org",
-            "keywords": [
-                "phpdoc"
-            ],
-            "abandoned": true,
-            "time": "2018-07-02T13:20:39+00:00"
-        },
         {
             "name": "sebastian/code-unit-reverse-lookup",
             "version": "1.0.1",