Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-05-10 07:59:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
slawkens 2025-05-09 13:45:54 +02:00
commit e719725841
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/cypress.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
php-versions: [ '8.1', '8.2', '8.3' ] php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
ots: ['tfs-1.4', 'canary-3.1.2'] # TODO: add 'tfs-master' (actually doesn't work cause AAC doesn't support reading .env configuration) ots: ['tfs-1.4', 'canary-3.1.2'] # TODO: add 'tfs-master' (actually doesn't work cause AAC doesn't support reading .env configuration)
name: Cypress (PHP ${{ matrix.php-versions }}, ${{ matrix.ots }}) name: Cypress (PHP ${{ matrix.php-versions }}, ${{ matrix.ots }})
steps: steps:
@ -146,6 +146,7 @@ jobs:
with: with:
name: cypress-screenshots-${{ matrix.php-versions }}-${{ matrix.ots }} name: cypress-screenshots-${{ matrix.php-versions }}-${{ matrix.ots }}
path: cypress/screenshots path: cypress/screenshots
if-no-files-found: ignore
- name: Upload Cypress Videos - name: Upload Cypress Videos
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -153,6 +154,7 @@ jobs:
with: with:
name: cypress-videos-${{ matrix.php-versions }}-${{ matrix.ots }} name: cypress-videos-${{ matrix.php-versions }}-${{ matrix.ots }}
path: cypress/videos path: cypress/videos
if-no-files-found: ignore
- name: Upload PHP Logs - name: Upload PHP Logs
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

4
system/libs/pot/OTS_Guild.php
View File

@ -97,7 +97,7 @@ class OTS_Guild extends OTS_Row_DAO implements IteratorAggregate, Countable
* *
* @param IOTS_GuildAction $invites Invites driver (don't pass it to clear driver). * @param IOTS_GuildAction $invites Invites driver (don't pass it to clear driver).
*/ */
public function setInvitesDriver(IOTS_GuildAction $invites = null) public function setInvitesDriver(?IOTS_GuildAction $invites = null)
{ {
$this->invites = $invites; $this->invites = $invites;
} }
@ -107,7 +107,7 @@ class OTS_Guild extends OTS_Row_DAO implements IteratorAggregate, Countable
* *
* @param IOTS_GuildAction $requests Membership requests driver (don't pass it to clear driver). * @param IOTS_GuildAction $requests Membership requests driver (don't pass it to clear driver).
*/ */
public function setRequestsDriver(IOTS_GuildAction $requests = null) public function setRequestsDriver(?IOTS_GuildAction $requests = null)
{ {
$this->requests = $requests; $this->requests = $requests;
} }

2
system/libs/pot/OTS_GuildRank.php
View File

@ -60,7 +60,7 @@ class OTS_GuildRank extends OTS_Row_DAO implements IteratorAggregate, Countable
* @throws PDOException On PDO operation error. * @throws PDOException On PDO operation error.
* @throws E_OTS_NotLoaded If given <var>$guild</var> object is not loaded. * @throws E_OTS_NotLoaded If given <var>$guild</var> object is not loaded.
*/ */
public function find($name, OTS_Guild $guild = null) public function find($name, ?OTS_Guild $guild = null)
{ {
$where = ''; $where = '';

6
system/libs/pot/OTS_Player.php
View File

@ -2026,7 +2026,7 @@ class OTS_Player extends OTS_Row_DAO
* @param OTS_GuildRank|null Guild rank (null to clear assign). * @param OTS_GuildRank|null Guild rank (null to clear assign).
* @throws E_OTS_NotLoaded If passed <var>$guildRank</var> parameter is not loaded. * @throws E_OTS_NotLoaded If passed <var>$guildRank</var> parameter is not loaded.
*/ */
public function setRank(OTS_GuildRank $guildRank = null) public function setRank(?OTS_GuildRank $guildRank = null)
{ {
if(isset($guildRank)) if(isset($guildRank))
$this->setRankId($guildRank->getId(), $guildRank->getGuild()->getId()); $this->setRankId($guildRank->getId(), $guildRank->getGuild()->getId());
@ -2632,7 +2632,7 @@ class OTS_Player extends OTS_Row_DAO
* @throws E_OTS_NotLoaded If player is not loaded. * @throws E_OTS_NotLoaded If player is not loaded.
* @throws PDOException On PDO operation error. * @throws PDOException On PDO operation error.
*/ */
public function setSlot($slot, OTS_Item $item = null, $pid = 0) public function setSlot($slot, ?OTS_Item $item = null, $pid = 0)
{ {
static $sid; static $sid;
@ -2776,7 +2776,7 @@ class OTS_Player extends OTS_Row_DAO
* @throws E_OTS_NotLoaded If player is not loaded. * @throws E_OTS_NotLoaded If player is not loaded.
* @throws PDOException On PDO operation error. * @throws PDOException On PDO operation error.
*/ */
public function setDepot($depot, OTS_Item $item = null, $pid = 0, $depot_id = 0) public function setDepot($depot, ?OTS_Item $item = null, $pid = 0, $depot_id = 0)
{ {
static $sid; static $sid;

5
system/template.php
View File

@ -136,6 +136,11 @@ if($forumSetting != '')
$twig->addGlobal('template_name', $template_name); $twig->addGlobal('template_name', $template_name);
$twig->addGlobal('template_path', $template_path); $twig->addGlobal('template_path', $template_path);
if($twig_loader) { if($twig_loader) {
$viewsPath = BASE . $template_path . '/views';
if (is_dir($viewsPath)) {
$twig_loader->prependPath($viewsPath);
}
$twig_loader->prependPath(BASE . $template_path); $twig_loader->prependPath(BASE . $template_path);
} }