Merge pull request #4269 from Deltik/php-8-compatibility

PHP 8.0 compatibility
e107inc · Dec 2, 2020 · ce30a09 · ce30a09
2 parents 0114aa2 + 28ae487
commit ce30a09
Show file tree

Hide file tree

Showing 76 changed files with 6,106 additions and 1,899 deletions.
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -17,15 +17,23 @@ jobs:
       matrix:
         interpreter:
           - image: php:5.6
+          - image: php:7.0
           - image: php:7.1
           - image: php:7.2
           - image: php:7.3
           - image: php:7.4
+          - image: php:8.0-rc
         db:
           - image: mysql:5.5
           - image: mysql:5.6
           - image: mysql:5.7
+          - image: bitnami/mysql:8.0
+          - image: mariadb:10.0
+          - image: mariadb:10.1
+          - image: mariadb:10.2
+          - image: mariadb:10.3
           - image: mariadb:10.4
+          - image: mariadb:10.5
     runs-on: ubuntu-latest
     container:
       image: ${{ matrix.interpreter.image }}
@@ -35,6 +43,7 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: 'Database Password for Continuous Integration'
           MYSQL_DATABASE: 'app'
+          MYSQL_AUTHENTICATION_PLUGIN: 'mysql_native_password'
         options: >-
           --health-cmd "mysqladmin ping"
           --health-interval 10s
@@ -77,9 +86,12 @@ jobs:
         if [ $(php -r 'printf(version_compare(PHP_VERSION, "7.2.0", ">=") ? 1 : 0);') = '1' ]
         then
           pecl install xdebug
-        elif [ $(php -r 'printf(version_compare(PHP_VERSION, "7.0.0", ">=") ? 1 : 0);') = '1' ]
+        elif [ $(php -r 'printf(version_compare(PHP_VERSION, "7.1.0", ">=") ? 1 : 0);') = '1' ]
         then
           pecl install xdebug-2.9.8
+        elif [ $(php -r 'printf(version_compare(PHP_VERSION, "7.0.0", ">=") ? 1 : 0);') = '1' ]
+        then
+          pecl install xdebug-2.7.2
         else
           pecl install xdebug-2.5.5
         fi
@@ -91,7 +103,7 @@ jobs:
       run: curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer
 
     - name: Install dependencies
-      run: composer install --prefer-dist --no-progress
+      run: composer update --prefer-dist --no-progress
       working-directory: ./e107_tests/
 
     - name: Download Git submodule dependencies

diff --git a/class2.php b/class2.php
@@ -2552,10 +2552,10 @@ private function deftrue($value)
 	 * @param $message
 	 * @param $file
 	 * @param $line
-	 * @param $context
+	 * @param $context (deprecated since PHP 7.2.0)
 	 * @return bool
 	 */
-	function handle_error($type, $message, $file, $line, $context) {
+	function handle_error($type, $message, $file, $line, $context = null) {
 		$startup_error = (!defined('E107_DEBUG_LEVEL')); // Error before debug system initialized
 
 

diff --git a/composer.json b/composer.json
@@ -17,16 +17,17 @@
     "platform": {
       "php": "5.6"
     },
-    "vendor-dir": "e107_handlers/vendor"
+    "vendor-dir": "e107_handlers/vendor",
+    "platform-check": false
   },
   "require": {
     "php": ">=5.6",
     "ext-json": "*",
     "ext-pdo": "*",
     "hybridauth/hybridauth": "^3.1.1",
     "phpmailer/phpmailer": "^6.1",
-    "tedivm/jshrink": "^1.3",
-    "ifsnop/mysqldump-php": "^2.8"
+    "ifsnop/mysqldump-php": "^2.8",
+    "matthiasmullie/minify": "^1.3"
   },
   "require-dev": {}
 }
diff --git a/composer.lock b/composer.lock
diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php
@@ -1414,7 +1414,7 @@ function check_lan_errors($english,$translation,$def, $opts=array())
 
 
 
-	function checkLog($type='error',$count)
+	function checkLog($type='error',$count=1)
 	{
 		$lan = $this->transLanguage;
 		$_SESSION['lancheck'][$lan][$type] += $count;
@@ -1602,9 +1602,9 @@ function get_comp_lan_phrases($comp_dir,$lang,$depth=0)
 
 
 	// for plugins and themes - checkes what kind of language files directory structure we have
-	function check_lanfiles($mode,$comp_name,$base_lan="English",$target_lan)
+	function check_lanfiles($mode,$comp_name,$base_lan="English",$target_lan=null)
 	{
-
+		if (empty($target_lan)) throw new RuntimeException(__METHOD__ . ' requires non-empty $target_lan');
 
 		$tp = e107::getParser();
 

diff --git a/e107_core/bbcodes/time.bb b/e107_core/bbcodes/time.bb
@@ -3,4 +3,4 @@
 $class = e107::getBB()->getClass('time');
 
 include_once(e_HANDLER."date_handler.php");
-return "<span class='{$class}'>".convert::convert_date($code_text, $parm)."</span>"; 
+return "<span class='{$class}'>".e107::getDate()->convert_date($code_text, $parm)."</span>";
diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php
@@ -43,7 +43,7 @@ function bb_format($id)
 		); 
 
 
-		if(BOOTSTRAP)
+		if(defined('BOOTSTRAP') && BOOTSTRAP)
 		{
 				$text = '<div class="btn-group">';
 				$text .= '<a class="btn btn-default btn-secondary dropdown-toggle" data-toggle="dropdown" href="#" title="">';

diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php
@@ -202,7 +202,8 @@ function sc_trackback($parm=null)
 	 */
 	function sc_newsnavlink($parm=null) //TODO add more options.
 	{
-
+		$url = e107::getUrl()->create('news/list/items'); // default for now.
+
 		if(varset($parm['list']) == 'all') // A list of all items - usually headings and thumbnails
 		{
 			$url = e107::getUrl()->create('news/list/all');
@@ -215,19 +216,14 @@ function sc_newsnavlink($parm=null) //TODO add more options.
 		{
 			$url = e107::getUrl()->create('news/list/category', $this->news_item); 		
 		}
-		else
-		{
-			$url = e107::getUrl()->create('news/list/items'); // default for now. 	
-		}
-
-
+
 		$caption = vartrue($parm['text'],LAN_BACK);
 
 		$text = '<ul class="pager hidden-print">
   			<li><a href="'.$url.'">'.e107::getParser()->toHTML($caption,false,'defs').'</a></li>
 		</ul>';
 
-		if(BOOTSTRAP === 4)
+		if(defined('BOOTSTRAP') && BOOTSTRAP === 4)
 		{
 			$text = '<a class="pager-button btn btn-primary hidden-print" href="'.$url.'">'.e107::getParser()->toHTML($caption,false,'defs').'</a>';
 		}

diff --git a/e107_core/shortcodes/batch/page_shortcodes.php b/e107_core/shortcodes/batch/page_shortcodes.php
@@ -166,7 +166,7 @@ function cpagecomments()
 
 		if(e107::getPref('comments_disabled') == 0 && !$comflag)
 		{
-			if(BOOTSTRAP)
+			if(defined('BOOTSTRAP') && BOOTSTRAP)
 			{
 				return e107::getMessage()->addInfo(LAN_PAGE_17)->render(); 
 			}

diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php
@@ -21,6 +21,8 @@ class user_shortcodes extends e_shortcode
 
 	function __construct()
 	{
+		parent::__construct();
+
 		$pref = e107::getPref();
 
 		$this->commentsDisabled = vartrue($pref['comments_disabled']);
@@ -797,7 +799,7 @@ function sc_user_extended_all($parm)
 						$extended_record = str_replace("EXTENDED_VALUE","USER_EXTENDED={$key}.value.{$this->var['user_id']}", $extended_record);
 						$extended_record = str_replace('{EXTENDED_ID}',$frm->name2id('user_'.$key), $extended_record);
 
-						if(HIDE_EMPTY_FIELDS === TRUE)
+						if(defined('HIDE_EMPTY_FIELDS') && HIDE_EMPTY_FIELDS === TRUE)
 						{
 							$this_value = $tp->parseTemplate("{USER_EXTENDED={$key}.value.{$this->var['user_id']}}", TRUE);