diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:14:49 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:14:49 +0200 |
| commit | cdaed8dabfbacd9db74cb302aaaf3efc756f02b8 (patch) | |
| tree | 9907e14040eb17d94530ce2f721ef7b2f6007a0f | |
| parent | 2fd2fb94cf4577b9a48c9d87cd0c14c852667a9f (diff) | |
| parent | 047c7375a5fa9f94afb2d490d761fb5ae434988f (diff) | |
| download | forums-cdaed8dabfbacd9db74cb302aaaf3efc756f02b8.tar forums-cdaed8dabfbacd9db74cb302aaaf3efc756f02b8.tar.gz forums-cdaed8dabfbacd9db74cb302aaaf3efc756f02b8.tar.bz2 forums-cdaed8dabfbacd9db74cb302aaaf3efc756f02b8.tar.xz forums-cdaed8dabfbacd9db74cb302aaaf3efc756f02b8.zip | |
Merge pull request #4475 from marc1706/ticket/14805
[ticket/14805] Ignore platform requirements while building packages
* marc1706/ticket/14805:
[ticket/14805] Ignore platform requirements while building packages
[ticket/8301] Add log_time index
| -rw-r--r-- | build/build.xml | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/add_log_time_index.php | 46 |
2 files changed, 48 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index b732521e3e..100795663b 100644 --- a/build/build.xml +++ b/build/build.xml @@ -49,7 +49,7 @@ --> <target name="composer"> <exec dir="phpBB" - command="php ../composer.phar install" + command="php ../composer.phar install --ignore-platform-reqs" checkreturn="true" passthru="true" /> </target> @@ -270,7 +270,7 @@ command="git archive ${revision} composer.phar | tar -xf - -C ${dir}" checkreturn="true" /> <exec dir="${dir}" - command="php composer.phar install --no-dev --optimize-autoloader" + command="php composer.phar install --no-dev --optimize-autoloader --ignore-platform-reqs" checkreturn="true" passthru="true" /> <delete file="${dir}/composer.phar" /> diff --git a/phpBB/phpbb/db/migration/data/v31x/add_log_time_index.php b/phpBB/phpbb/db/migration/data/v31x/add_log_time_index.php new file mode 100644 index 0000000000..f53eedcd49 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/add_log_time_index.php @@ -0,0 +1,46 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class add_log_time_index extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v319', + ); + } + + public function update_schema() + { + return array( + 'add_index' => array( + $this->table_prefix . 'log' => array( + 'log_time' => array('log_time'), + ), + ), + ); + } + + public function revert_schema() + { + return array( + 'drop_keys' => array( + $this->table_prefix . 'log' => array( + 'log_time', + ), + ), + ); + } +} |