From e08b15ede8b9cc7452663d074520ff613b934717 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 2 Feb 2015 10:51:06 +0100
Subject: [PATCH 1/3] [ticket/456] Remove functions_modules.php

The functions in functions_modules.php were already deprecated.

B3P-456
---
 includes/functions_modules.php                | 61 ---------------
 .../unit/functions/functions_modules_test.php | 76 -------------------
 2 files changed, 137 deletions(-)
 delete mode 100644 includes/functions_modules.php
 delete mode 100644 tests/unit/functions/functions_modules_test.php

diff --git a/includes/functions_modules.php b/includes/functions_modules.php
deleted file mode 100644
index 1fc8216d..00000000
--- a/includes/functions_modules.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
-*
-* @package Board3 Portal v2.1
-* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-// @codingStandardsIgnoreStart
-/**
- * @ignore
- */
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-// @codingStandardsIgnoreEnd
-
-/**
- * Convert column number to string equivalent
- *
- * @param int $column Column number
- *
- * @return string String representation of column number; default: ''
- * @deprecated 2.1.0-RC1 (to be removed: 2.1.0)
- */
-function column_num_string($column)
-{
-	$portal_columns = new \board3\portal\portal\columns();
-	return $portal_columns->number_to_string($column);
-}
-
-/**
- * Convert column string to equivalent number
- *
- * @param string $column Column name
- *
- * @return int The column number; default: 0
- * @deprecated 2.1.0-RC1 (to be removed: 2.1.0)
- */
-function column_string_num($column)
-{
-	$portal_columns = new \board3\portal\portal\columns();
-	return $portal_columns->string_to_number($column);
-}
-
-/**
- * Convert column string to equivalent constant
- *
- * @param string $column Column name
- *
- * @return int Column constant; default: 0
- * @deprecated 2.1.0-RC1 (to be removed: 2.1.0)
- */
-function column_string_const($column)
-{
-	$portal_columns = new \board3\portal\portal\columns();
-	return $portal_columns->string_to_constant($column);
-}
diff --git a/tests/unit/functions/functions_modules_test.php b/tests/unit/functions/functions_modules_test.php
deleted file mode 100644
index e6755a33..00000000
--- a/tests/unit/functions/functions_modules_test.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
-*
-* @package Board3 Portal testing
-* @copyright (c) Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-require_once(dirname(__FILE__) . '/../../../includes/functions_modules.php');
-
-class phpbb_functions_functions_modules_test extends PHPUnit_Framework_TestCase
-{
-	public function data_column_num_string()
-	{
-		return array(
-			array('', ''),
-			array('', false),
-			array('left', 1),
-			array('center', 2),
-			array('right', 3),
-			array('top', 4),
-			array('bottom', 5),
-		);
-	}
-
-	/**
-	* @dataProvider data_column_num_string
-	*/
-	public function test_column_num_string($expected, $input)
-	{
-		$this->assertEquals($expected, column_num_string($input));
-	}
-
-	public function data_column_string_num()
-	{
-		return array(
-			array(0, ''),
-			array(0, false),
-			array(1, 'left'),
-			array(2, 'center'),
-			array(3, 'right'),
-			array(4, 'top'),
-			array(5, 'bottom'),
-		);
-	}
-
-	/**
-	* @dataProvider data_column_string_num
-	*/
-	public function test_column_string_num($expected, $input)
-	{
-		$this->assertEquals($expected, column_string_num($input));
-	}
-
-	public function data_column_string_const()
-	{
-		return array(
-			array(0, ''),
-			array(0, ''),
-			array(2, 'left'),
-			array(4, 'center'),
-			array(8, 'right'),
-			array(1, 'top'),
-			array(16, 'bottom'),
-		);
-	}
-
-	/**
-	* @dataProvider data_column_string_const
-	*/
-	public function test_column_string_const($expected, $input)
-	{
-		$this->assertEquals($expected, column_string_const($input));
-	}
-}

From 0e58d8326741d957eecdafad59828b3e4bfb6913 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 2 Feb 2015 10:52:14 +0100
Subject: [PATCH 2/3] [ticket/456] Ignore coding standards in functions.php

B3P-456
---
 includes/functions.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index f13b878f..8322d1cd 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -7,18 +7,15 @@
 *
 */
 
-// @codingStandardsIgnoreStart
-
 /**
  * @ignore
+ * @codingStandardsIgnoreFile
  */
 if (!defined('IN_PHPBB'))
 {
 	exit;
 }
 
-// @codingStandardsIgnoreEnd
-
 // Get portal config
 function obtain_portal_config()
 {

From f1ca2d8a39709de72738225a9dbdd6f2b6e99ca6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 2 Feb 2015 10:58:15 +0100
Subject: [PATCH 3/3] [ticket/456] Do not include functions_modules in
 controller

B3P-456
---
 controller/main.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/controller/main.php b/controller/main.php
index ae9e4edb..f814de54 100644
--- a/controller/main.php
+++ b/controller/main.php
@@ -116,7 +116,6 @@ class main
 
 		if (!function_exists('obtain_portal_config'))
 		{
-			include($this->includes_path . 'functions_modules' . $this->php_ext);
 			include($this->includes_path . 'functions' . $this->php_ext);
 		}
 	}