Dev

.env.dist

@@ -24,6 +24,9 @@ APP_POWERED_BY_PHPLIST=0
 PREFERENCEPAGE_SHOW_PRIVATE_LISTS=0
 
 API_BASE_URL=http://api.phplist.local/
+# Website address without scheme (e.g. www.example.com). Used as the default of the "website" setting;
+# the "domain" setting defaults to the same value without a leading "www.". Both are editable in the admin UI.
+APP_WEBSITE=phplist.local
 FRONT_END_BASE_URL=http://frontend.phplist.local
 
 PARALLEL_USE_WITH_PHPLIST3=0

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/core-docs.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: mbstring, dom, fileinfo, mysql
       - name: Get composer cache directory
         id: composer-cache

.github/workflows/i18n-validate.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1']
+        php: ['8.2']
 
     steps:
       - name: Checkout

composer.json

@@ -45,7 +45,7 @@
         "source": "https://github.com/phpList/core"
     },
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "symfony/framework-bundle": "^6.4",
         "symfony/dependency-injection": "^6.4",
         "symfony/config": "^6.4",

config/parameters.yml

@@ -20,9 +20,12 @@ parameters:
     app.dev_email: '%env(APP_DEV_EMAIL)%'
     app.powered_by_phplist: '%env(APP_POWERED_BY_PHPLIST)%'
     app.preference_page_show_private_lists: '%env(PREFERENCEPAGE_SHOW_PRIVATE_LISTS)%'
-    app.rest_api_base_url: '%env(API_BASE_URL)%/api/v2'
+    app.rest_api_base_url: '%env(API_BASE_URL)%api/v2'
     app.api_base_url: '%env(API_BASE_URL)%'
     app.frontend_base_url: '%env(FRONT_END_BASE_URL)%'
+    # falls back to empty so existing .env files without APP_WEBSITE keep working (the value may live in the database)
+    env(APP_WEBSITE): ''
+    app.website: '%env(APP_WEBSITE)%'
 
     app.parallel_use_with_phplist3: '%env(PARALLEL_USE_WITH_PHPLIST3)%'
 

config/services.yml

@@ -55,6 +55,10 @@ services:
     arguments:
       $tablePrefix: '%database.prefix%'
 
+  PhpList\Core\Core\Doctrine\SkippedMigrationRecorder:
+    autowire: true
+    autoconfigure: true
+
   PhpList\Core\Core\Doctrine\SearchIndexDoctrineListener:
     arguments:
       $enabled: '%elasticsearch.enabled%'

config/services/parameters.yml

@@ -14,3 +14,5 @@ parameters:
     notify_end_default: 'end@example.com'
     always_add_google_tracking: true
     click_track: true
+    # sign click-tracking links with the application secret, see LinkTrackTokenService
+    click_track_sign_with_hmac: false

config/services/providers.yml

@@ -16,6 +16,8 @@ services:
 
   PhpList\Core\Domain\Configuration\Service\Provider\DefaultConfigProvider:
     autowire: true
+    arguments:
+      $website: '%app.website%'
 
   PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider:
     autowire: true

config/services/repositories.yml

@@ -11,6 +11,14 @@ services:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Analytics\Model\LinkTrackUmlClick
+  PhpList\Core\Domain\Analytics\Repository\LinkTrackForwardRepository:
+    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
+    arguments:
+      - PhpList\Core\Domain\Analytics\Model\LinkTrackForward
+  PhpList\Core\Domain\Analytics\Repository\LinkTrackMlRepository:
+    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
+    arguments:
+      - PhpList\Core\Domain\Analytics\Model\LinkTrackMl
 
 
   PhpList\Core\Domain\Configuration\Repository\ConfigRepository:

config/services/services.yml

@@ -26,6 +26,10 @@ services:
     autowire: true
     autoconfigure: true
 
+  PhpList\Core\Domain\Messaging\EventSubscriber\InjectedByHeaderSubscriber:
+    autowire: true
+    autoconfigure: true
+
   PhpList\Core\Domain\Messaging\Service\ForwardContentService:
     autowire: true
     autoconfigure: true
@@ -61,6 +65,21 @@ services:
     autoconfigure: true
     public: true
 
+  PhpList\Core\Domain\Analytics\Service\LinkRewriter:
+    autowire: true
+
+  PhpList\Core\Domain\Analytics\Service\AnalyticsTrackingService:
+    autowire: true
+
+  PhpList\Core\Domain\Analytics\Service\LinkTrackTokenService:
+    autowire: true
+    autoconfigure: true
+
+  PhpList\Core\Domain\Analytics\Service\LinkClickService:
+    autowire: true
+    autoconfigure: true
+    public: true
+
   PhpList\Core\Domain\Analytics\Service\AnalyticsService:
     autowire: true
     autoconfigure: true
@@ -249,6 +268,11 @@ services:
     autoconfigure: true
     public: true
 
+  PhpList\Core\Domain\Identity\Service\Notification\:
+    resource: '../../src/Domain/Identity/Service/Notification/*.php'
+    autowire: true
+    autoconfigure: true
+
   PhpList\Core\Domain\Identity\Service\AdminNotifier:
     autowire: true
     autoconfigure: true