add 7.3.0.0 sourceGuardian v16 PHP 8

Author: SeifertDaniel

.github/workflows/ci-release.yml

@@ -0,0 +1,81 @@
+name: CI Release
+
+on:
+  push:
+    branches:
+      - 'rel_*'
+      - 'main'
+      - 'master'
+  workflow_dispatch:
+    inputs:
+      debug:
+        required: false
+        default: "false"
+
+jobs:
+  package-tests:
+    runs-on: ubuntu-latest
+
+    services:
+      mariadb:
+        image: mariadb:10.6
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: oxid
+          MYSQL_USER: oxid
+          MYSQL_PASSWORD: oxid
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mysqladmin ping --silent"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # min
+          - oxid_ref: "dev-b-7.0-ce"
+            php: "8.0"
+          # max
+          - oxid_ref: "dev-b-7.4-ce"
+            php: "8.4"
+            
+    name: OXID ${{ matrix.oxid_ref }} in PHP ${{ matrix.php }} tests
+
+    env:
+      DB_HOST: 127.0.0.1
+      DB_NAME: oxid
+      DB_USER: oxid
+      DB_PASS: oxid
+
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+
+      - name: Run OXID tests
+        uses: d3datadevelopment/ci-actions/oxid-plugin-test@v1.1.0
+        with:
+          php_version: ${{ matrix.php }}
+          oxid_ref: ${{ matrix.oxid_ref }}
+          sourceguardian: "FALSE"
+          composer_package_name: "d3/modcfg"
+          oxid_module_ids: "d3modcfg_lib"
+          syntax_check_paths: "."
+          debug: ${{ github.event.inputs.debug }}
+
+  report-status:
+    runs-on: ubuntu-latest
+    needs: package-tests
+    if: always()
+    steps:
+      - name: Report CI status
+        uses: d3datadevelopment/ci-actions/status-reporter@v1.1.0
+        with:
+          api_status_endpoint: "${{ vars.GITEA_API }}${{ github.sha }}"
+          auth_token: ${{ secrets.GITEA_TOKEN }}
+          state: ${{ needs.package-tests.result }}
+          description: "CI result: ${{ needs.package-tests.result }}"
+          target_url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"

.php-cs-fixer.php

@@ -22,7 +22,6 @@
 use D3\ModCfg\Application\Model\Install\d3install;
 use D3\ModCfg\Application\Model\Configuration\d3_cfg_mod;
 use D3\ModCfg\Application\Model\d3str;
-use D3\ModCfg\Application\Model\d3filesystem;
 use D3\ModCfg\Application\Model\Log\d3log;
 use D3\ModCfg\Application\Model\Shopcompatibility\d3ShopCompatibilityAdapterHandler;
 use D3\ModCfg\Application\Model\Shopcompatibility\d3shopversionconverter;

Application/Controller/Admin/Configuration/d3mod_status.php

@@ -17,7 +17,7 @@
 
 use D3\ModCfg\Application\Model\Configuration\d3modprofile;
 use D3\ModCfg\Application\Model\Constants;
-use Doctrine\DBAL\Connection;
+use D3\ModCfg\Application\Model\d3database;
 use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Exception as DBALException;
 use DOMAttr;
@@ -33,7 +33,6 @@
 use OxidEsales\Eshop\Core\Str;
 use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
-use OxidEsales\EshopCommunity\Internal\Framework\Database\ConnectionProviderInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Database\QueryBuilderFactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -157,8 +156,7 @@ public function d3FixNamespaceNavigation()
      */
     protected function prepareWhereQuery($aWhere, $sqlFull)
     {
-        /** @var Connection $db */
-        $db = ContainerFactory::getInstance()->getContainer()->get(ConnectionProviderInterface::class)->get();
+        $db = d3database::getInstance()->getDBConnection();
         $sQ = parent::prepareWhereQuery($aWhere, $sqlFull);
 
         $oProfiles = $this->d3getListItemObject();
@@ -196,8 +194,7 @@ protected function _calcListItemsCount($sSql)
 
         // count SQL
         $oQB = ContainerFactory::getInstance()->getContainer()->get(QueryBuilderFactoryInterface::class)->create();
-        /** @var Connection $db */
-        $db = ContainerFactory::getInstance()->getContainer()->get(ConnectionProviderInterface::class)->get();
+        $db = d3database::getInstance()->getDBConnection();
         $oQB->select('count(*)')->from('');
 
         $sSql = $oStr->preg_replace('/select .*? from/i', $oQB->getSQL(), $sSql);
@@ -309,8 +306,7 @@ protected function _prepareOrderByQuery($sSql = null)
     {
         // sorting
         $aSortFields = $this->getListSorting();
-        /** @var Connection $db */
-        $db = ContainerFactory::getInstance()->getContainer()->get(ConnectionProviderInterface::class)->get();
+        $db = d3database::getInstance()->getDBConnection();
 
         if (is_array($aSortFields) && count($aSortFields)) {
             // only add order by at full sql not for count(*)