From 488c5294d7e4e8dd4a6c7cb57e46e2fc5f8c4e30 Mon Sep 17 00:00:00 2001 From: Michael Moravec Date: Sat, 18 Aug 2018 01:29:01 +0200 Subject: [PATCH 1/2] Update export-ignores --- .gitattributes | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitattributes b/.gitattributes index d15eb35f48f..5bbaf359701 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,12 +1,15 @@ -/tests export-ignore +/.appveyor.yml export-ignore +/.gitattributes export-ignore +/.github export-ignore +/.gitignore export-ignore +/.scrutinizer.yml export-ignore +/.travis.yml export-ignore +/build.properties export-ignore +/build.xml export-ignore +/composer.lock export-ignore /docs export-ignore -.gitattributes export-ignore -.gitignore export-ignore -.appveyor.yml export-ignore -.travis.yml export-ignore -build.properties export-ignore -build.xml export-ignore -phpunit.xml.dist export-ignore -run-all.sh export-ignore /phpcs.xml.dist export-ignore -/composer.lock export-ignore +/phpstan.neon.dist export-ignore +/phpunit.xml.dist export-ignore +/run-all.sh export-ignore +/tests export-ignore From 1bfc30bd284222aeac7951a530bb54f7ce383657 Mon Sep 17 00:00:00 2001 From: Michael Moravec Date: Sat, 18 Aug 2018 01:29:44 +0200 Subject: [PATCH 2/2] Drop archive.exclude section in composer.json --- composer.json | 3 --- composer.lock | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index db678f71b62..01c5abc97ec 100644 --- a/composer.json +++ b/composer.json @@ -44,8 +44,5 @@ "dev-master": "2.9.x-dev", "dev-develop": "3.0.x-dev" } - }, - "archive": { - "exclude": ["!vendor", "tests", "*phpunit.xml", ".appveyor.yml", ".travis.yml", "build.xml", "build.properties", "composer.phar"] } } diff --git a/composer.lock b/composer.lock index 4d74e4eb956..8eb6bc50ee9 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": "69dd02e4a1e8f77823b3676b3f707ef6", + "content-hash": "c1b5ddb5a1259c7ac793dd9c6e6d657a", "packages": [ { "name": "doctrine/cache",