1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00

1278 Commits

Author SHA1 Message Date
Oliver Schramm
1ee7df57ae [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG
PHPBB3-12855
2014-07-15 22:58:28 +02:00
Stanislav Atanasov
1043d1a27c [ticket/12846] SQLite3 bug in profilefield_base_migration.php
Using profilefield_base_migration.php to create a custom profile
field with SQlite3 DBMS returns warning:

[phpBB Debug] PHP Warning: in file [ROOT]/phpbb/db/driver/sqlite3.php
on line 218: SQLite3Result::fetchArray(): Unable to execute statement:
constraint failed

This is due passing filed_id and lang_id to the DB driver in
unspecified format. As they are always int we should cast them
in int to prevent the error message appearance.

PHPBB3-12846
2014-07-13 01:45:20 +03:00
Joas Schilling
4449793b07 [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2 2014-07-11 16:04:27 +02:00
Andreas Fischer
b2a883d504 Merge pull request #2671 from Nicofuma/ticket/12775
[ticket/12775] Replace functions_container with a container_builder class.

* Nicofuma/ticket/12775: (34 commits)
  [ticket/12775] Set dbal.conn.driver as synthetic during installation
  [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
  [ticket/12775] Inject the connection when created in the container
  [ticket/12775] Extract the vars later in install/install_update.php
  [ticket/12775] Rename config_php_handler to config_php_file container_builder
  [ticket/12775] Set defined_vars as a property of config_php_file
  [ticket/12775] Fix doc blocks in the container builder
  [ticket/12775] Remove useless includes of config.php
  [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
  [ticket/12775] Fix comments
  [ticket/12775] Update doc blocks
  [ticket/12775] Fix container_builder
  [ticket/12775] Rename config_php to config_php_file
  [ticket/12775] Renamed to \phpbb\di\container_builder
  [ticket/12775] Remove the last include of functions_container
  [ticket/12775] Fix unit tests
  [ticket/12775] Add tests for \phpbb\config_php
  [ticket/12775] Add tests for the container factory
  [ticket/12775] Use a field instead of a local var in load_config_var()
  [ticket/12775] Update container and config in install/
  ...
2014-07-11 11:49:51 +02:00
Andreas Fischer
147b942e5c Merge pull request #2711 from n-aleha/ticket/12829
[ticket/12829] Remove check for pgsql 8.3/8.2

* n-aleha/ticket/12829:
  [ticket/12829] Remove check for pgsql 8.3/8.2
2014-07-11 10:17:03 +02:00
Joas Schilling
d5fd1ecfc8 Merge pull request #2675 from lucifer4o/ticket/12786
[ticket/12786] Extend profilefield_base_migration.php class

* lucifer4o/ticket/12786:
  [ticket/12786] Correcting some tabs
  [ticket/12786] Array_merge instead copy array parts
  [ticket/12786] Some changes of the comments.
  [ticket/12786] Dixing a typo
  [ticket/12786] Some minor fixes of comments and function naming
  [ticket/12786] Add clean_cpf_db_entries
  [ticket/12786] White spaces found
  [ticket/12786] Add create_language_entries
  [ticket/12786] Add get_custom_field_id
  [ticket/12786] Extend profilefield_base_migration.php class
2014-07-09 17:00:43 +02:00
Stanislav Atanasov
c468a5d8d4 [ticket/12786] Correcting some tabs
Some tabs needed corection

PHPBB3-12786
2014-07-08 22:01:49 +03:00
Marc Alexander
b132939471 Merge remote-tracking branch 'nickvergessen/ticket/12834' into develop-ascraeus 2014-07-08 18:48:32 +02:00
Joas Schilling
91f5d59f69 Merge pull request #2676 from Nicofuma/ticket/12787
[ticket/12787] Allow the route to say that the referer has to be used.

* Nicofuma/ticket/12787:
  [ticket/12787] Updates phpbb_mock_controller_helper
  [ticket/12787] Add controller_helper::get_current_url()
  [ticket/12787] Remove one app.php when it's both in $path and $web_root_path
  [ticket/12787] Fix the absolute board url
  [ticket/12787] Use a parameter (_referer) instead of the Referer header
  [ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer()
  [ticket/12099] Remove config again
  [ticket/12099] Correctly fix the path when performing AJAX requests
  [ticket/12099] Add request argument to path_helper service
2014-07-08 18:09:41 +02:00
Joas Schilling
e3e236da72 [ticket/12834] Correctly match directories in session page
Also clean path before working with it

PHPBB3-12834
2014-07-08 17:53:32 +02:00
Tristan Darricau
b170c6a8db Merge pull request #2695 from VSEphpbb/ticket/12812
[ticket/12812] Add a migrator tool for config_text database changes

* VSEphpbb/ticket/12812:
  [ticket/12812] Remove unused global $db from tests
  [ticket/12812] Improve migrator config_text tool tests
  [ticket/12812] Improve migrator config_text tool tests
  [ticket/12812] Add a migrator tool for config_text database changes
2014-07-08 00:52:51 +02:00
Tristan Darricau
9374d14e27 [ticket/12787] Add controller_helper::get_current_url()
PHPBB3-12787
2014-07-08 00:04:11 +02:00
n-aleha
b08497f66c [ticket/12829] Remove check for pgsql 8.3/8.2
Remove check for pgsql 8.3/8.2 and set multi_insert to true.

PHPBB3-12829
2014-07-07 23:10:18 +03:00
Tristan Darricau
42fde81b21 Merge pull request #2690 from Noxwizard/ticket/12802
[ticket/12802] Properly handle connection failures in SQLite3

* Noxwizard/ticket/12802:
  [ticket/12802] Properly handle connection failures in SQLite3
2014-07-07 21:56:35 +02:00
Joas Schilling
29a07404d3 Merge pull request #2672 from Nicofuma/ticket/12782
[ticket/12782] Use an interface for the phpbb event_dispatcher

* Nicofuma/ticket/12782:
  [ticket/12782] Add doc block
  [ticket/12782] Use an interface for the phpbb event_dispatcher
2014-07-07 20:23:10 +02:00
Tristan Darricau
e2cbaf4f1a [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
PHPBB3-12775
2014-07-07 01:02:50 +02:00
Tristan Darricau
5b11ee8c97 [ticket/12775] Inject the connection when created in the container
PHPBB3-12775
2014-07-07 01:02:49 +02:00
Tristan Darricau
6c57fbecac [ticket/12775] Rename config_php_handler to config_php_file container_builder
PHPBB3-12775
2014-07-07 01:02:46 +02:00
Tristan Darricau
8c0d179e3e [ticket/12775] Set defined_vars as a property of config_php_file
PHPBB3-12775
2014-07-07 01:02:44 +02:00
Tristan Darricau
35c0b6d77a [ticket/12775] Fix doc blocks in the container builder
PHPBB3-12775
2014-07-07 01:02:43 +02:00
Tristan Darricau
ed812a9dfb [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
PHPBB3-12775
2014-07-07 01:02:40 +02:00
Tristan Darricau
98e8be966b [ticket/12775] Fix comments
PHPBB3-12775
2014-07-07 01:02:39 +02:00
Tristan Darricau
15c23e60b8 [ticket/12775] Update doc blocks
PHPBB3-12775
2014-07-07 01:02:37 +02:00
Tristan Darricau
f2e8e928c0 [ticket/12775] Fix container_builder
PHPBB3-12775
2014-07-07 01:02:36 +02:00
Tristan Darricau
2db160ff87 [ticket/12775] Rename config_php to config_php_file
PHPBB3-12775
2014-07-07 01:02:34 +02:00
Tristan Darricau
40937e21c5 [ticket/12775] Renamed to \phpbb\di\container_builder
PHPBB3-12775
2014-07-07 01:02:33 +02:00
Tristan Darricau
1d966fbc86 [ticket/12775] Add tests for the container factory
PHPBB3-12775
2014-07-07 01:02:27 +02:00
Tristan Darricau
c87f44c669 [ticket/12775] Use a field instead of a local var in load_config_var()
PHPBB3-12775
2014-07-07 01:02:26 +02:00
Tristan Darricau
ef1346c931 [ticket/12775] Update phpBB/install/index.php
PHPBB3-12775
2014-07-07 01:02:20 +02:00
Tristan Darricau
e7804ecce4 [ticket/12775] Update phpBB/install/database_update.php
PHPBB3-12775
2014-07-07 01:02:19 +02:00
Tristan Darricau
78648514fa [ticket/12775] Update phpBB/bin/phpbbcli.php
PHPBB3-12775
2014-07-07 01:02:16 +02:00
Tristan Darricau
98890fe1a3 [ticket/12775] Fix config_php::load_config_file()
PHPBB3-12775
2014-07-07 01:02:14 +02:00
Tristan Darricau
01c25d3d6b [ticket/12775] Use the config.php handler in \phpbb\config_php
PHPBB3-12775
2014-07-07 01:02:12 +02:00
Tristan Darricau
b9995405cf [ticket/12775] Add get() and get_all() into config_php
PHPBB3-12775
2014-07-07 01:02:10 +02:00
Tristan Darricau
301d9ce990 [ticket/12775] Add a config.php class (and service)
PHPBB3-12775
2014-07-07 01:02:09 +02:00
Tristan Darricau
cbe846a64e [ticket/12775] Don't assign $container to null
PHPBB3-12775
2014-07-07 01:02:07 +02:00
Tristan Darricau
86205454af [ticket/12775] Add customs parameters
PHPBB3-12775
2014-07-07 01:02:06 +02:00
Tristan Darricau
cdf87e0078 [ticket/12775] Add a conter_factory class and remove functions_container
PHPBB3-12775
2014-07-07 01:02:04 +02:00
Joas Schilling
e3e0c79b7a [ticket/12515] Remove check for PostgreSQL 8.3+
PHPBB3-12515
2014-07-06 19:31:46 +02:00
Tristan Darricau
7399f29df8 [ticket/12787] Remove one app.php when it's both in $path and $web_root_path
PHPBB3-12787
2014-07-05 14:01:14 +02:00
Matt Friedman
606d82f7dd [ticket/12812] Add a migrator tool for config_text database changes
PHPBB3-12812
2014-07-05 00:57:34 -07:00
Nils Adermann
53ff23671c Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus
* github-nicofuma/ticket/12446:
  [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
2014-07-04 21:08:20 +02:00
Stanislav Atanasov
4cec5bcd55 [ticket/12786] Array_merge instead copy array parts
nickvergessen proposed this

PHPBB3-12786
2014-07-04 14:49:23 +03:00
Patrick Webster
3ca708edad [ticket/12802] Properly handle connection failures in SQLite3
PHPBB3-12802
2014-07-03 13:05:54 -05:00
Stanislav Atanasov
c9da9ec858 [ticket/12786] Some changes of the comments.
Comments and quotes

PHPBB3-12786

[ticket/12786]

PHPBB3-12786

Revert "[ticket/12786]"

This reverts commit 61a6647101731110f67689b109de953f7449b03e.
2014-07-03 20:18:51 +03:00
Tristan Darricau
0232fcc22a Merge pull request #2673 from nickvergessen/ticket/12783
Ticket/12783 Move require:phpbb/phpbb to extra:phpbb/phpbb in Extensions composer.json files

* nickvergessen/ticket/12783:
  [ticket/12783] Move phpbb requirement to extra->soft-require
  [ticket/12783] Correctly use dataProviders and mark tests as incomplete
  [ticket/12783] Move phpbb/phpbb require version to extra
2014-07-03 14:23:49 +02:00
Joas Schilling
a0e00889d1 Merge pull request #2670 from Nicofuma/ticket/12781
[ticket/12781] Template regex for IF catch too many things

* Nicofuma/ticket/12781:
  [ticket/12781] Add tests
  [ticket/12781] Template regex for IF catch too many things
2014-07-03 12:44:33 +02:00
Joas Schilling
b0a3f2dc8f Merge pull request #2578 from marc1706/ticket/9801
[ticket/9801] Allow display of page outside board directory on viewonline

* marc1706/ticket/9801:
  [ticket/9801] Use empty instead of sizeof
  [ticket/9801] Remove spaces before * in docblock
  [ticket/9801] Add viewonline_helper service to allow proper testing
  [ticket/9801] Allow display of page outside board directory on viewonline
2014-07-03 12:02:48 +02:00
Joas Schilling
107693ff58 Merge pull request #2647 from Dragooon/ticket/12334
[ticket/12334] Add PROFILE_FIELD_VALUE_RAW template var

* Dragooon/ticket/12334:
  [ticket/12334] Remove profile fields test group
  [ticket/12334] Add additional test for type_string
  [ticket/12334] Add string test for type_int
  [ticket/12334] Improve type_dropdown's test description
  [ticket/12334] Group profile fields test
  [ticket/12334] Change get_profile_value_raw_data to profile_value_raw_data
  [ticket/12334] Add get_profile_value_raw unit test for type_bool
  [ticket/12334] Add get_profile_value_raw unit test for type_date
  [ticket/12334] Add get_profile_value_raw unit tests for type_dropdown
  [ticket/12334] Add get_profile_value_raw unit test for type_string
  [ticket/12334] Add get_profile_value_raw unit test for type_url
  [ticket/12334] Add get_profile_value_raw unit tests for type_int
  [ticket/12334] Removed tests
  [ticket/12334] Dropdowns cannot be tested this way
  [ticket/12334] Added test get_profile_value_raw
  [ticket/12334] Changed from valueid to value_raw
  [ticket/12334] Implemented get_profile_valueid method
  [ticket/12334] Added field_novalue fall-back as requested
  [ticket/12334] Add PROFILE_FIELD_VALUEID template var
2014-07-03 11:21:16 +02:00
Joas Schilling
3f0dec4ce6 [ticket/12783] Move phpbb requirement to extra->soft-require
PHPBB3-12783
2014-07-02 16:23:20 +02:00