forked from GNUsocial/gnu-social
		
	[DEPENDENCY] Add wikimedia/composer-merge-plugin as a dependency, to allow managing plugins
This commit is contained in:
		@@ -36,7 +36,8 @@
 | 
			
		||||
        "symfony/validator": "5.1.*",
 | 
			
		||||
        "symfony/web-link": "5.1.*",
 | 
			
		||||
        "symfony/yaml": "5.1.*",
 | 
			
		||||
        "twig/markdown-extra": "^3.0"
 | 
			
		||||
        "twig/markdown-extra": "^3.0",
 | 
			
		||||
        "wikimedia/composer-merge-plugin": "^1.4"
 | 
			
		||||
    },
 | 
			
		||||
    "require-dev": {
 | 
			
		||||
        "friendsofphp/php-cs-fixer": "^2.16",
 | 
			
		||||
@@ -93,6 +94,13 @@
 | 
			
		||||
        "symfony": {
 | 
			
		||||
            "allow-contrib": false,
 | 
			
		||||
            "require": "5.1.*"
 | 
			
		||||
        },
 | 
			
		||||
        "merge-plugin": {
 | 
			
		||||
            "include": [
 | 
			
		||||
                "composer.local.json"
 | 
			
		||||
            ],
 | 
			
		||||
            "replace": true,
 | 
			
		||||
            "ignore-duplicates": false
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										51
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										51
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							@@ -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": "bc5cc577cedf0c270809dd40c6ae1e13",
 | 
			
		||||
    "content-hash": "bffd76e2c9ff0377f42cdda0eb6db49e",
 | 
			
		||||
    "packages": [
 | 
			
		||||
        {
 | 
			
		||||
            "name": "alchemy/resource-component",
 | 
			
		||||
@@ -7847,6 +7847,55 @@
 | 
			
		||||
                "validate"
 | 
			
		||||
            ],
 | 
			
		||||
            "time": "2020-04-18T12:12:48+00:00"
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
            "name": "wikimedia/composer-merge-plugin",
 | 
			
		||||
            "version": "v1.4.1",
 | 
			
		||||
            "source": {
 | 
			
		||||
                "type": "git",
 | 
			
		||||
                "url": "https://github.com/wikimedia/composer-merge-plugin.git",
 | 
			
		||||
                "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100"
 | 
			
		||||
            },
 | 
			
		||||
            "dist": {
 | 
			
		||||
                "type": "zip",
 | 
			
		||||
                "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/81c6ac72a24a67383419c7eb9aa2b3437f2ab100",
 | 
			
		||||
                "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100",
 | 
			
		||||
                "shasum": ""
 | 
			
		||||
            },
 | 
			
		||||
            "require": {
 | 
			
		||||
                "composer-plugin-api": "^1.0",
 | 
			
		||||
                "php": ">=5.3.2"
 | 
			
		||||
            },
 | 
			
		||||
            "require-dev": {
 | 
			
		||||
                "composer/composer": "~1.0.0",
 | 
			
		||||
                "jakub-onderka/php-parallel-lint": "~0.8",
 | 
			
		||||
                "phpunit/phpunit": "~4.8|~5.0",
 | 
			
		||||
                "squizlabs/php_codesniffer": "~2.1.0"
 | 
			
		||||
            },
 | 
			
		||||
            "type": "composer-plugin",
 | 
			
		||||
            "extra": {
 | 
			
		||||
                "branch-alias": {
 | 
			
		||||
                    "dev-master": "1.3.x-dev"
 | 
			
		||||
                },
 | 
			
		||||
                "class": "Wikimedia\\Composer\\MergePlugin"
 | 
			
		||||
            },
 | 
			
		||||
            "autoload": {
 | 
			
		||||
                "psr-4": {
 | 
			
		||||
                    "Wikimedia\\Composer\\": "src/"
 | 
			
		||||
                }
 | 
			
		||||
            },
 | 
			
		||||
            "notification-url": "https://packagist.org/downloads/",
 | 
			
		||||
            "license": [
 | 
			
		||||
                "MIT"
 | 
			
		||||
            ],
 | 
			
		||||
            "authors": [
 | 
			
		||||
                {
 | 
			
		||||
                    "name": "Bryan Davis",
 | 
			
		||||
                    "email": "bd808@wikimedia.org"
 | 
			
		||||
                }
 | 
			
		||||
            ],
 | 
			
		||||
            "description": "Composer plugin to merge multiple composer.json files",
 | 
			
		||||
            "time": "2017-04-25T02:31:25+00:00"
 | 
			
		||||
        }
 | 
			
		||||
    ],
 | 
			
		||||
    "packages-dev": [
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user