yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

PHP/Compat

Browse Source 
* remove sources of deprecation warnings. Mostly dynamic creation of object properties.
 * some string function no longer accept null as string
This commit is contained in:
Sarjuuk
2024-07-03 14:55:33 +02:00
parent 05c036bd9f
commit 2bd588045a
12 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/areatrigger.php
View File

@@ -20,8 +20,6 @@ class AreaTriggerPage extends GenericPage
public function __construct($pageCall, $id)
{
$this->contribute = CONTRIBUTE_NONE;
parent::__construct($pageCall, $id);
$this->typeId = intVal($id);

59
pages/genericPage.class.php
View File

@@ -22,13 +22,9 @@ trait TrDetailPage
protected $redButtons = []; // see template/redButtons.tpl.php
protected $smartAI = null;
protected $map = null;
protected $article = null;
protected $headIcons = [];
protected $expansion = EXP_CLASSIC;
protected $contribute = CONTRIBUTE_ANY;
protected function generateCacheKey(bool $withStaff = true) : string
{
$staff = intVal($withStaff && User::isInGroup(U_GROUP_EMPLOYEE));
@@ -149,7 +145,6 @@ trait TrProfiler
{
$this->prepareContent();
$this->contribute = CONTRIBUTE_NONE;
$this->notFound = array(
'title' => sprintf(Lang::profiler('firstUseTitle'), $this->subjectName, $this->realm),
'msg' => ''
@@ -187,7 +182,7 @@ class GenericPage
protected $reqUGroup = U_GROUP_NONE;
protected $reqAuth = false;
protected $mode = CACHE_TYPE_NONE;
// protected $contribute; // defined in __construct()
protected $contribute = CONTRIBUTE_NONE;
protected $wowheadLink = 'https://wowhead.com/';
@@ -197,6 +192,12 @@ class GenericPage
protected $name = ''; // for h1-Element
protected $tabId = null;
protected $gDataKey = false; // adds the dataKey to the user vars
protected $notFound = [];
protected $pageTemplate = [];
protected $article = null;
protected $articleUrl = '';
protected $editAccess = null; // 0 is valid access value, so null
protected $scripts = array(
[SC_JS_FILE, 'js/jquery-3.7.0.min.js', SC_FLAG_NO_TIMESTAMP ],
[SC_JS_FILE, 'js/basic.js' ],
@@ -212,23 +213,24 @@ class GenericPage
);
// private vars don't get cached
private $time = 0;
private $cacheDir = 'cache/template/';
private $jsgBuffer = [];
private $gPageInfo = [];
private $gUser = [];
private $pageTemplate = [];
private $community = ['co' => [], 'sc' => [], 'vi' => []];
private $time = 0;
private $cacheDir = 'cache/template/';
private $jsgBuffer = [];
private $gPageInfo = [];
private $gUser = [];
private $gFavorites = [];
private $community = ['co' => [], 'sc' => [], 'vi' => []];
private $announcements = [];
private $cacheLoaded = [];
private $skipCache = 0x0;
private $memcached = null;
private $mysql = ['time' => 0, 'count' => 0];
private $cacheLoaded = [];
private $skipCache = 0x0;
private $memcached = null;
private $mysql = ['time' => 0, 'count' => 0];
private $js = [];
private $css = [];
private $headerLogo = '';
private $fullParams = '';
private $js = [];
private $css = [];
private $headerLogo = '';
private $fullParams = '';
private $lvTemplates = array(
'achievement' => ['template' => 'achievement', 'id' => 'achievements', 'parent' => 'lv-generic', 'data' => [], 'name' => '$LANG.tab_achievements' ],
@@ -274,9 +276,6 @@ class GenericPage
$this->title[] = Cfg::get('NAME');
if (!isset($this->contribute))
$this->contribute = CONTRIBUTE_NONE;
$this->fullParams = $pageCall;
if ($pageParam)
$this->fullParams .= '='.$pageParam;
@@ -439,7 +438,7 @@ class GenericPage
{
$this->gPageInfo = array(
'articleUrl' => $this->fullParams, // is actually be the url-param
'editAccess' => isset($this->editAccess) ? $this->editAccess : (U_GROUP_ADMIN | U_GROUP_EDITOR | U_GROUP_BUREAU)
'editAccess' => $this->editAccess ?? (U_GROUP_ADMIN | U_GROUP_EDITOR | U_GROUP_BUREAU)
);
}
@@ -453,7 +452,7 @@ class GenericPage
$this->postCache();
// determine contribute tabs
if (isset($this->subject) && !isset($this->contribute))
if (isset($this->subject))
{
$x = get_class($this->subject);
$this->contribute = $x::$contribute;
@@ -469,7 +468,7 @@ class GenericPage
$this->community['vi'] = CommunityContent::getVideos($this->type, $this->typeId);
// as comments are not cached, those globals cant be either
if ($this->contribute)
if ($this->contribute != CONTRIBUTE_NONE)
{
$this->extendGlobalData(CommunityContent::getJSGlobals());
$this->applyGlobals();
@@ -716,12 +715,12 @@ class GenericPage
// unknown page
public function error() : void
{
$this->path = null;
$this->tabId = null;
// $this->path = null;
// $this->tabId = null;
$this->articleUrl = 'page-not-found';
$this->title[] = Lang::main('errPageTitle');
$this->name = Lang::main('errPageTitle');
$this->lvTabs = [];
// $this->lvTabs = [];
$this->addArticle();

3
pages/guide.php
View File

@@ -30,7 +30,6 @@ class GuidePage extends GenericPage
protected /* string */ $author = '';
protected /* array */ $gPageInfo = [];
protected /* int */ $show = self::SHOW_GUIDE;
protected /* int */ $articleUrl = '';
private /* array */ $validCats = [1, 2, 3, 4, 5, 6, 7, 8, 9];
private /* string */ $extra = '';
@@ -59,8 +58,6 @@ class GuidePage extends GenericPage
public function __construct($pageCall, $pageParam)
{
$this->contribute = CONTRIBUTE_CO;
$guide = explode( "&", $pageParam, 2);
parent::__construct($pageCall, $pageParam);

1
pages/more.php
View File

@@ -10,7 +10,6 @@ if (!defined('AOWOW_REVISION'))
class MorePage extends GenericPage
{
protected $articleUrl = '';
protected $tabsTitle = '';
protected $privReqPoints = '';
protected $forceTabs = true;

2
pages/sound.php
View File

@@ -10,8 +10,6 @@ class SoundPage extends GenericPage
{
use TrDetailPage;
protected $articleUrl = '';
protected $type = Type::SOUND;
protected $typeId = 0;
protected $tpl = 'sound';