From e2b20bbe3c3c09e9bc43fbc7d0ffcee6262397f7 Mon Sep 17 00:00:00 2001 From: Stefan Seehafer Date: Fri, 16 Aug 2024 11:14:06 +0200 Subject: [PATCH 1/2] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 78ff7a378..61344dd51 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,14 +38,14 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -59,4 +59,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 From ea2649ff7ef8e8a6107ba9559b36f217433208fc Mon Sep 17 00:00:00 2001 From: stefan Date: Fri, 16 Aug 2024 11:21:46 +0200 Subject: [PATCH 2/2] module migration bugfixes --- inc/controller/action/packagemgr/modules/base.php | 2 +- inc/module/module.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/controller/action/packagemgr/modules/base.php b/inc/controller/action/packagemgr/modules/base.php index 4b908516d..b07366bf2 100644 --- a/inc/controller/action/packagemgr/modules/base.php +++ b/inc/controller/action/packagemgr/modules/base.php @@ -105,7 +105,7 @@ public function process() $updater = (new \fpcm\model\updater\modules())->getDataCachedByKey($this->key); $this->steps['pkgKey'] = $this->key; $this->steps['pkgurl'] = $updater['packageUrl'] ?? ''; - $this->steps['pkgname'] = $updater['packageUrl'] ? basename($updater['packageUrl']) : ''; + $this->steps['pkgname'] = isset($updater['packageUrl']) ? basename($updater['packageUrl']) : ''; $this->steps['pkgsize'] = isset($updater->size) && $updater->size ? '(' . \fpcm\classes\tools::calcSize($updater->size) . ')' : ''; $this->view->setViewVars($this->steps); diff --git a/inc/module/module.php b/inc/module/module.php index 46a8c091b..3d744e4aa 100644 --- a/inc/module/module.php +++ b/inc/module/module.php @@ -512,7 +512,7 @@ final public function getFullPrefix($key = '') : string final public function getTableObject(string $tableName) : null|\fpcm\model\system\yatdl { $filePath = $this->getConfigPathFromCurrent('tables' . DIRECTORY_SEPARATOR . $tableName . '.yml'); - if (!file_exists($t)) { + if (!file_exists($filePath)) { return null; }