Adjust Test Setup

.gitattributes

@@ -1,15 +1,12 @@
-
 * -text
 
-
-# Exclude build/test files from archive to reduce ZIP size for composer dist download
 /.github export-ignore
 /tests export-ignore
 /.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.markdownlint.json export-ignore
-/.php-cs-fixer.dist.php export-ignore
+/.php-cs-fixer-finder.dist.php export-ignore
 /CLA.md export-ignore
 /CONTRIBUTING.md export-ignore
 /codeception.dist.yml export-ignore

.github/ci/files/bin/console

@@ -1,47 +1,29 @@
 #!/usr/bin/env php
 <?php
 /**
- * Pimcore
+ * OpenDXP
+ *
+ * This source file is licensed under the GNU General Public License version 3 (GPLv3).
  *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- * @license    http://www.pimcore.org/license     GPLv3 and PEL
+ * @copyright  Copyright (c) Pimcore GmbH (https://pimcore.com)
+ * @copyright  Modification Copyright (c) OpenDXP (https://www.opendxp.ch)
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html  GNU General Public License version 3 (GPLv3)
  */
 
-use Symfony\Component\Console\Input\InputInterface;
-
-ob_get_clean();
+use OpenDxp\Bootstrap;
+use OpenDxp\Console\Application;
 
-if (file_exists($a = getcwd() . '/vendor/autoload_runtime.php')) {
-    include $a;
-} elseif (file_exists($a = __DIR__ . '/../../../../vendor/autoload_runtime.php')) {
-    include $a;
-} elseif (file_exists($a = __DIR__ . '/../vendor/autoload_runtime.php')) {
-    include $a;
-} else {
-    fwrite(STDERR, 'Cannot locate autoloader; please run "composer install"' . PHP_EOL);
-    exit(1);
-}
+include __DIR__ . '/../vendor/autoload_runtime.php';
 
-return function (InputInterface $input) {
-    define('OPENDXP_CONSOLE', true);
+define('OPENDXP_PROJECT_ROOT', __DIR__ . '/..');
+define('OPENDXP_CONSOLE', true);
 
-    if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
-        putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
-    }
+return static function () {
 
-    if ($input->hasParameterOption('--no-debug', true)) {
-        putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
-    }
+    $kernel = Bootstrap::startupCli();
 
-    /** @var \Pimcore\Kernel $kernel */
-    $kernel = \OpenDxp\Bootstrap::startupCli();
-    $application = new \OpenDxp\Console\Application($kernel);
-    $application->run();
-    return $application;
-};
+    return new Application($kernel);
+};

.github/ci/files/config/bundles.php

@@ -1,6 +1,6 @@
 <?php
 
 return [
-    \OpenDxp\Bundle\AdminBundle\OpenDxpAdminBundle::class => ['all' => true],
-    \OpenDxp\Bundle\DataHubBundle\OpenDxpDataHubBundle::class => ['all' => true]
+    OpenDxp\Bundle\AdminBundle\OpenDxpAdminBundle::class     => ['all' => true],
+    OpenDxp\Bundle\DataHubBundle\OpenDxpDataHubBundle::class => ['all' => true]
 ];

.github/ci/files/config/config.yaml

@@ -1,9 +1,78 @@
-imports:
-    - { resource: services.yaml }
-    - { resource: system.yml }
+parameters:
+    secret: ThisTokenIsNotSoSecretChangeIt
+    opendxp_test.db.dsn: '%env(OPENDXP_TEST_DB_DSN)%'
+    env(OPENDXP_TEST_DB_DSN): ~
+    opendxp.encryption.secret: 'def00000fc1e34a17a03e2ef85329325b0736a5941633f8062f6b0a1a20f416751af119256bea0abf83ac33ef656b3fff087e1ce71fa6b8810d7f854fe2781f3fe4507f6'
+
+doctrine:
+    dbal:
+        connections:
+            default:
+                url: '%opendxp_test.db.dsn%'
+                mapping_types:
+                    enum: string
+                    bit: boolean
 
 opendxp_data_hub:
     config_location:
         data_hub:
             write_target:
                 type: 'settings-store'
+
+opendxp:
+    general:
+        timezone: Europe/Berlin
+        path_variable: ''
+        domain: opendxp-test.dev
+        redirect_to_maindomain: false
+        valid_languages: 'en,de'
+        fallback_languages:
+            en: ''
+            de: ''
+        default_language: ''
+        disable_usage_statistics: false
+    documents:
+        versions:
+            days: null
+            steps: 10
+        error_pages:
+            default: /error
+        allow_trailing_slash: 'no'
+        generate_preview: true
+    objects:
+        versions:
+            days: null
+            steps: 10
+    assets:
+        versions:
+            days: null
+            steps: 10
+        icc_rgb_profile: ''
+        icc_cmyk_profile: ''
+    full_page_cache:
+        enabled: false
+        lifetime: null
+        exclude_patterns: ''
+        exclude_cookie: ''
+    httpclient:
+        adapter: Socket
+        proxy_host: ''
+        proxy_port: ''
+        proxy_user: ''
+        proxy_pass: ''
+    email:
+        sender:
+            name: opendxp
+            email: opendxp@example.com
+        return:
+            name: opendxp
+            email: opendxp@example.com
+        debug:
+            email_addresses: ''
+    applicationlog:
+        mail_notification:
+            send_log_summary: false
+            filter_priority: null
+            mail_receiver: ''
+        archive_treshold: '30'
+        archive_alternative_database: ''

.github/ci/files/config/packages/security.yaml

@@ -2,30 +2,19 @@ security:
     providers:
         opendxp_admin:
             id: OpenDxp\Security\User\UserProvider
-
     firewalls:
         dev:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
-
-        # Pimcore WebDAV HTTP basic // DO NOT CHANGE!
-        opendxp_webdav:
-            pattern: ^/asset/webdav
+        opendxp_admin_webdav:
+            pattern: ^/admin/asset/webdav
             provider: opendxp_admin
             http_basic: ~
-
         opendxp_admin: '%opendxp_admin_bundle.firewall_settings%'
-
     access_control:
-        # Pimcore admin ACl  // DO NOT CHANGE!
         - { path: ^/admin/settings/display-custom-logo, roles: PUBLIC_ACCESS }
-        - { path: ^/admin/login/2fa-verify, roles: IS_AUTHENTICATED_2FA_IN_PROGRESS }
-        - { path: ^/admin/login/2fa-setup, roles: ROLE_OPENDXP_USER }
-        - { path: ^/admin/login/2fa, roles: IS_AUTHENTICATED_2FA_IN_PROGRESS }
         - { path: ^/admin/login$, roles: PUBLIC_ACCESS }
         - { path: ^/admin/login/(login|lostpassword|deeplink|csrf-token)$, roles: PUBLIC_ACCESS }
         - { path: ^/admin, roles: ROLE_OPENDXP_USER }
-
     role_hierarchy:
-        # Pimcore admin  // DO NOT CHANGE!
         ROLE_OPENDXP_ADMIN: [ROLE_OPENDXP_USER]

.github/ci/files/config/packages/test/config.yaml

@@ -1,33 +1,2 @@
 imports:
     - { resource: ../../config.yaml }
-
-# this cache is used during tests when setting up pimcore
-framework:
-    cache:
-        pools:
-            opendxp.cache.pool:
-                public: true
-                tags: true
-                default_lifetime: 31536000  # 1 year
-                adapter: cache.adapter.array
-
-
-doctrine:
-    dbal:
-        connections:
-            default:
-                url: '%opendxp_test.db.dsn%'
-                host: ~
-                port: ~
-                dbname: ~
-                user: ~
-                password: ~
-                mapping_types:
-                    enum: string
-                    bit: boolean
-
-
-parameters:
-    opendxp_test.db.dsn: '%env(OPENDXP_TEST_DB_DSN)%'
-    env(OPENDXP_TEST_DB_DSN): ~
-    opendxp.encryption.secret: 'def00000fc1e34a17a03e2ef85329325b0736a5941633f8062f6b0a1a20f416751af119256bea0abf83ac33ef656b3fff087e1ce71fa6b8810d7f854fe2781f3fe4507f6'

.github/ci/files/config/routes/test/routes.yaml

@@ -0,0 +1,2 @@
+_opendxp:
+    resource: '@OpenDxpCoreBundle/config/routing.yaml'

.github/ci/files/kernel/Kernel.php

@@ -1,15 +1,15 @@
 <?php
 /**
- * Pimcore
+ * OpenDXP
+ *
+ * This source file is licensed under the GNU General Public License version 3 (GPLv3).
  *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- * @license    http://www.pimcore.org/license     GPLv3 and PEL
+ * @copyright  Copyright (c) Pimcore GmbH (https://pimcore.com)
+ * @copyright  Modification Copyright (c) OpenDXP (https://www.opendxp.ch)
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html  GNU General Public License version 3 (GPLv3)
  */
 
 namespace App;