diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-07-11 11:49:51 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-07-11 11:49:51 +0200 |
| commit | b2a883d504d9ece8525fcc1a4aa8e44a000db6ca (patch) | |
| tree | 81a85d5242913fa7e667b5adc873bd4a500ed406 /phpBB/includes/functions.php | |
| parent | 147b942e5c885f13181f0cb4d67cb4ccee4652df (diff) | |
| parent | 58a52fe5b90215d090ba3b992f96d401d805440c (diff) | |
| download | forums-b2a883d504d9ece8525fcc1a4aa8e44a000db6ca.tar forums-b2a883d504d9ece8525fcc1a4aa8e44a000db6ca.tar.gz forums-b2a883d504d9ece8525fcc1a4aa8e44a000db6ca.tar.bz2 forums-b2a883d504d9ece8525fcc1a4aa8e44a000db6ca.tar.xz forums-b2a883d504d9ece8525fcc1a4aa8e44a000db6ca.zip | |
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/
...
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 9d5770069d..158bf1cbc0 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5327,52 +5327,6 @@ function phpbb_to_numeric($input) } /** -* Convert either 3.0 dbms or 3.1 db driver class name to 3.1 db driver class name. -* -* If $dbms is a valid 3.1 db driver class name, returns it unchanged. -* Otherwise prepends phpbb\db\driver\ to the dbms to convert a 3.0 dbms -* to 3.1 db driver class name. -* -* @param string $dbms dbms parameter -* @return db driver class -*/ -function phpbb_convert_30_dbms_to_31($dbms) -{ - // Note: this check is done first because mysqli extension - // supplies a mysqli class, and class_exists($dbms) would return - // true for mysqli class. - // However, per the docblock any valid 3.1 driver name should be - // recognized by this function, and have priority over 3.0 dbms. - if (strpos($dbms, 'phpbb\db\driver') === false && class_exists('phpbb\db\driver\\' . $dbms)) - { - return 'phpbb\db\driver\\' . $dbms; - } - - if (class_exists($dbms)) - { - // Additionally we could check that $dbms extends phpbb\db\driver\driver. - // http://php.net/manual/en/class.reflectionclass.php - // Beware of possible performance issues: - // http://stackoverflow.com/questions/294582/php-5-reflection-api-performance - // We could check for interface implementation in all paths or - // only when we do not prepend phpbb\db\driver\. - - /* - $reflection = new \ReflectionClass($dbms); - - if ($reflection->isSubclassOf('phpbb\db\driver\driver')) - { - return $dbms; - } - */ - - return $dbms; - } - - throw new \RuntimeException("You have specified an invalid dbms driver: $dbms"); -} - -/** * Get the board contact details (e.g. for emails) * * @param \phpbb\config\config $config |