From 8d012197f4ef345210e8b35760f3bcfd59018cc6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 12 Apr 2014 16:34:47 +0200
Subject: [PATCH 1/3] [ticket/12390] Remove documentation, tests and other
 files from vendor/

PHPBB3-12390
---
 build/build.xml | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/build/build.xml b/build/build.xml
index 3a2a66b113..ea12e60e3c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -273,6 +273,89 @@
 		<delete dir="${dir}/develop" />
 		<delete dir="${dir}/install/data" />
 
+		<!-- Delete unrelated files from vendor/, see PHPBB3-12390 -->
+		<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
+		<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
+		<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
+		<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
+		<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
+		<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
+
+		<delete dir="${dir}/vendor/psr/log/Psr/Log/Test" />
+		<delete file="${dir}/vendor/psr/log/.gitignore" />
+		<delete file="${dir}/vendor/psr/log/README.md" />
+
+		<delete dir="${dir}/vendor/symfony/config/Symfony/Component/Config/Tests" />
+		<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/.gitignore" />
+		<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/README.md" />
+		<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/console/Symfony/Component/Console/Tests" />
+		<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/.gitignore" />
+		<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/README.md" />
+		<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/debug/Symfony/Component/Debug/Tests" />
+		<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/.gitignore" />
+		<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/README.md" />
+		<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests" />
+		<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/.gitignore" />
+		<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/README.md" />
+		<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests" />
+		<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore" />
+		<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/README.md" />
+		<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/Tests" />
+		<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/.gitignore" />
+		<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/README.md" />
+		<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests" />
+		<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/.gitignore" />
+		<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/README.md" />
+		<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests" />
+		<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/.gitignore" />
+		<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md" />
+		<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/routing/Symfony/Component/Routing/Tests" />
+		<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/.gitignore" />
+		<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/README.md" />
+		<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/Tests" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/README.md" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/twig/twig/doc" />
+		<delete dir="${dir}/vendor/twig/twig/ext" />
+		<delete dir="${dir}/vendor/twig/twig/test" />
+		<delete file="${dir}/vendor/twig/twig/.editorconfig" />
+		<delete file="${dir}/vendor/twig/twig/.gitignore" />
+		<delete file="${dir}/vendor/twig/twig/.travis.yml" />
+		<delete file="${dir}/vendor/twig/twig/AUTHORS" />
+		<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
+		<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
+		<delete file="${dir}/vendor/twig/twig/README.markdown" />
+
 		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
 		<!-- set permissions of all files to 644, directories to 755 -->
 		<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />

From 013cc2c66f4ca594e8ffa09511d054604ac615e5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 16 Apr 2014 20:16:03 +0200
Subject: [PATCH 2/3] [ticket/12390] Move cleaning of vendor into it's own
 target

PHPBB3-12390
---
 build/build.xml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index ea12e60e3c..c1f81fb947 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -273,6 +273,22 @@
 		<delete dir="${dir}/develop" />
 		<delete dir="${dir}/install/data" />
 
+		<phingcall target="clean-vendor-dir">
+			<property name="dir" value="${dir}" />
+		</phingcall>
+
+		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
+		<!-- set permissions of all files to 644, directories to 755 -->
+		<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />
+		<exec dir="${dir}" command="find . -type d|xargs chmod 755" escape="false" />
+		<!-- set permissions of some directories to 777 -->
+		<chmod mode="0777" file="${dir}/cache" />
+		<chmod mode="0777" file="${dir}/store" />
+		<chmod mode="0777" file="${dir}/files" />
+		<chmod mode="0777" file="${dir}/images/avatars/upload" />
+	</target>
+
+	<target name="clean-vendor-dir">
 		<!-- Delete unrelated files from vendor/, see PHPBB3-12390 -->
 		<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
 		<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
@@ -355,16 +371,6 @@
 		<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
 		<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
 		<delete file="${dir}/vendor/twig/twig/README.markdown" />
-
-		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
-		<!-- set permissions of all files to 644, directories to 755 -->
-		<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />
-		<exec dir="${dir}" command="find . -type d|xargs chmod 755" escape="false" />
-		<!-- set permissions of some directories to 777 -->
-		<chmod mode="0777" file="${dir}/cache" />
-		<chmod mode="0777" file="${dir}/store" />
-		<chmod mode="0777" file="${dir}/files" />
-		<chmod mode="0777" file="${dir}/images/avatars/upload" />
 	</target>
 
 	<target name="clean-diff-dir">

From 1757fdd4b7b1f8c461e1d4bbc949eb6eb35c3fe8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 16 Apr 2014 20:25:45 +0200
Subject: [PATCH 3/3] [ticket/12390] Add comment to composer.json to update the
 build target

PHPBB3-12390
---
 phpBB/composer.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpBB/composer.json b/phpBB/composer.json
index 3cf83a8fe9..2941293e81 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -1,4 +1,8 @@
 {
+	"_readme": [
+		"You MUST update the clean-vendor-dir target in build/build.xml",
+		"accordingly when adding or upgrading dependencies."
+	],
 	"minimum-stability": "beta",
 	"require": {
 		"lusitanian/oauth": "0.2.*",