IBX-10495: Updated info on Elasticsearch service

.github/workflows/ci.yaml

@@ -14,9 +14,9 @@ jobs:
     strategy:
       matrix:
         php:
-          - '8.0'
+          - '8.3'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
@@ -26,9 +26,9 @@ jobs:
           extensions: 'pdo_sqlite, gd'
           tools: cs2pr
 
-      - uses: "ramsey/composer-install@v1"
+      - uses: ramsey/composer-install@v3
         with:
-          dependency-versions: "highest"
+          dependency-versions: highest
 
       - name: Run code style check
         run: composer run-script check-cs -- --format=checkstyle | cs2pr
@@ -42,12 +42,10 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '7.4'
-          - '8.0'
-          - '8.1'
+          - '8.3'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
@@ -57,9 +55,9 @@ jobs:
           extensions: pdo_sqlite, gd
           tools: cs2pr
 
-      - uses: "ramsey/composer-install@v1"
+      - uses: ramsey/composer-install@v3
         with:
-          dependency-versions: "highest"
+          dependency-versions: highest
 
       - name: Setup problem matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

.github/workflows/rector.yaml

@@ -0,0 +1,27 @@
+name: Rector PHP
+
+on:
+    push:
+        branches:
+            - main
+            - '[0-9]+.[0-9]+'
+    pull_request: ~
+
+jobs:
+    rector:
+        name: Run rector
+        runs-on: "ubuntu-22.04"
+        strategy:
+            matrix:
+                php:
+                    - '8.3'
+        steps:
+            -   uses: actions/checkout@v5
+
+            -   uses: ibexa/gh-workflows/actions/composer-install@main
+                with:
+                    gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
+                    gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
+
+            -   name: Run rector
+                run: vendor/bin/rector process --dry-run --ansi

composer.json

@@ -10,22 +10,23 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": ">=8.3",
         "composer-plugin-api": "^2.0",
         "composer/semver": "^3.2"
     },
     "require-dev": {
         "composer/composer": "^2.0.8",
-        "phpstan/phpstan": "^1",
-        "phpstan/phpstan-phpunit": "^1",
-        "phpstan/phpstan-webmozart-assert": "^1",
-        "symfony/console": "^5.2",
-        "symfony/dotenv": "^5.2",
-        "symfony/finder": "^5.2",
-        "symfony/filesystem": "^5.2",
-        "symfony/phpunit-bridge": "^5.2",
-        "symfony/process": "^5.2",
-        "ibexa/code-style": "^1.0"
+        "ibexa/code-style": "~2.0.0",
+        "ibexa/rector": "~5.0.x-dev",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-webmozart-assert": "^2.0",
+        "symfony/console": "^7.3",
+        "symfony/dotenv": "^7.3",
+        "symfony/filesystem": "^7.3",
+        "symfony/finder": "^7.3",
+        "symfony/phpunit-bridge": "^7.3",
+        "symfony/process": "^7.3"
     },
     "autoload": {
         "psr-4": {
@@ -60,7 +61,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "4.6.x-dev"
+            "dev-main": "5.0.x-dev"
         },
         "class": "Ibexa\\PostInstall\\PostInstall"
     }

rector.php

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+use Ibexa\Contracts\Rector\Sets\IbexaSetList;
+use Rector\Config\RectorConfig;
+use Rector\Symfony\Set\SymfonySetList;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/src',
+    ])
+    ->withSets([
+        IbexaSetList::IBEXA_50->value,
+        SymfonySetList::SYMFONY_60,
+        SymfonySetList::SYMFONY_61,
+        SymfonySetList::SYMFONY_62,
+        SymfonySetList::SYMFONY_63,
+        SymfonySetList::SYMFONY_64,
+        SymfonySetList::SYMFONY_70,
+        SymfonySetList::SYMFONY_71,
+        SymfonySetList::SYMFONY_72,
+    ]);

resources/platformsh/common/5.0/.nvmrc

@@ -0,0 +1 @@
+v22.16.0

resources/platformsh/common/4.6/.platform/services.yaml → resources/platformsh/common/5.0/.platform/services.yaml

@@ -4,7 +4,7 @@
 #     Reach out to platform.sh support to get help on this and insight into your disk/memory usage.
 
 mysqldb:
-    type: mariadb:10.4
+    type: mariadb:10.11
     disk: 1024
     configuration:
         schemas:
@@ -24,7 +24,7 @@ mysqldb:
 
 # For use by Symfony Cache (used by Ibexa DXP SPI Persistence Cache)
 rediscache:
-    type: 'redis:5.0'
+    type: 'redis:7.2'
     # For cache you might need to increase the size of your plan if your installation has a sizeable amount of content.
     # Check with platform.sh staff if in doubt on this, and if it would make sense to configure larger redis size here.
     # size: L
@@ -37,14 +37,14 @@ rediscache:
 # If you wish to have a separate Redis instance for sessions, uncomment
 # this service and the corresponding relationship in .platform.app.yaml.
 #redissession:
-#    type: 'redis:5.0'
+#    type: 'redis:7.2'
 #    configuration:
 #        maxmemory_policy: allkeys-lru
 #
 # Alternatively if you have a requirement that sessions are persisted across server/redis restarts,
 # have storage space to spare for this, and don't mind a bit slower instance type of redis
 #redissession:
-#    type: redis-persistent:5.0
+#    type: redis-persistent:7.2
 # Disk size should be bigger than Redis'  "maxmemory" setting due to https://redis.io/topics/persistence#log-rewriting.
 # The memory given to Redis depends on your plan and "size: ". Adjust "disk: " accordingly.
 #    disk: 512
@@ -57,7 +57,7 @@ rediscache:
 # Multi core setup is currently not supported on Platform.sh. Sharding does not work as the cores are
 # unable to reach each other
 #solrsearch:
-#    type: solr:7.7
+#    type: solr:8.11
 #    disk: 512
 #    configuration:
 #        configsets:
@@ -71,10 +71,8 @@ rediscache:
 #            collection1:
 #                core: collection1
 
-# If you wish to use elasticsearch, uncomment this service and the corresponding relationship in .platform.app.yaml.
-#elasticsearch:
-#    type: elasticsearch:7.7
-#    disk: 512
+# If you wish to use elasticsearch, uncomment the corresponding relationship in .platform.app.yaml
+# and see documentation on how to define ES service: https://docs.upsun.com/add-services/elasticsearch.html
 
 # Due to logic in app/config/env/platformsh.php, do not change the service name to something different than 'varnish'
 varnish:

resources/platformsh/common/4.6/.platform/varnish.vcl → resources/platformsh/common/5.0/.platform/varnish.vcl

@@ -1,7 +1,7 @@
 // Varnish VCL for Platform.sh with:
 // - Varnish 6.0 or higher (6.0LTS recommended, and is what we mainly test against)
 //   - Varnish xkey vmod (via varnish-modules package 0.10.2 or higher, or via Varnish Plus)
-// - eZ Platform 3.x or higher with ezplatform-http-cache (this) bundle
+// - Ibexa DXP 5.x or higher with ibexa/http-cache bundle
 //
 
 // Not applicable on Platform.sh:
@@ -25,7 +25,7 @@ acl debuggers {
 sub vcl_recv {
 
     // Set the backend
-    //set req.backend_hint = ezplatform;
+    //set req.backend_hint = ibexa;
     // Platform.sh specific:
     set req.backend_hint = app.backend();
 
@@ -40,7 +40,7 @@ sub vcl_recv {
     }
 
     // Trigger cache purge if needed
-    call ez_purge;
+    call ibexa_purge;
 
     // Don't cache requests other than GET and HEAD.
     if (req.method != "GET" && req.method != "HEAD") {
@@ -60,8 +60,8 @@ sub vcl_recv {
     if (req.http.cookie) {
         set req.http.cookie = ";" + req.http.cookie;
         set req.http.cookie = regsuball(req.http.cookie, "; +", ";");
-        set req.http.cookie = regsuball(req.http.cookie, ";(eZSESSID[^=]*)=", "; \1=");
-        set req.http.cookie = regsuball(req.http.cookie, ";(ibexa-[^=]*)=", "; \1=");
+        set req.http.cookie = regsuball(req.http.cookie, ";(IBX_SESSION_ID[^=]*)=", "; \1=");
+        set req.http.cookie = regsuball(req.http.cookie, ";(ibexa[-_][^=]*)=", "; \1=");
         set req.http.cookie = regsuball(req.http.cookie, ";[^ ][^;]*", "");
         set req.http.cookie = regsuball(req.http.cookie, "^[; ]+|[; ]+$", "");
 
@@ -81,7 +81,7 @@ sub vcl_recv {
     set req.url = std.querysort(req.url);
 
     // Retrieve client user context hash and add it to the forwarded request.
-    call ez_user_context_hash;
+    call ibexa_user_context_hash;
 
     // If it passes all these tests, do a lookup anyway.
     return (hash);
@@ -146,13 +146,13 @@ sub vcl_backend_response {
 // Handle purge
 // You may add FOSHttpCacheBundle tagging rules
 // See http://foshttpcache.readthedocs.org/en/latest/varnish-configuration.html#id4
-sub ez_purge {
+sub ibexa_purge {
     // Retrieve purge token, needs to be here due to restart, match for PURGE method done within
-    call ez_invalidate_token;
+    call ibexa_invalidate_token;
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_tags_xkey.vcl
     if (req.method == "PURGEKEYS") {
-        call ez_purge_acl;
+        call ibexa_purge_acl;
 
         # If neither of the headers are provided we return 400 to simplify detecting wrong configuration
         if (!req.http.xkey-purge && !req.http.xkey-softpurge) {
@@ -175,13 +175,13 @@ sub ez_purge {
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_purge.vcl
     if (req.method == "PURGE") {
-        call ez_purge_acl;
+        call ibexa_purge_acl;
 
         return (purge);
     }
 }
 
-sub ez_purge_acl {
+sub ibexa_purge_acl {
     if (req.http.x-invalidate-token) {
         if (req.http.x-invalidate-token != req.http.x-backend-invalidate-token) {
             return (synth(405, "Method not allowed"));
@@ -192,7 +192,7 @@ sub ez_purge_acl {
 }
 
 // Sub-routine to get client user context hash, used to for being able to vary page cache on user rights.
-sub ez_user_context_hash {
+sub ibexa_user_context_hash {
 
     // Prevent tampering attacks on the hash mechanism
     if (req.restarts == 0
@@ -241,7 +241,7 @@ sub ez_user_context_hash {
 }
 
 // Sub-routine to get invalidate token.
-sub ez_invalidate_token {
+sub ibexa_invalidate_token {
     // Prevent tampering attacks on the token mechanisms
     if (req.restarts == 0
         && (req.http.accept ~ "application/vnd.ezplatform.invalidate-token"

resources/platformsh/ibexa-commerce/4.6/.platform.app.yaml → resources/platformsh/ibexa-commerce/5.0/.platform.app.yaml

@@ -161,13 +161,17 @@ hooks:
             echo "TIP: If you need to authenticate against Github/Gitlab/updates.ibexa.co, use COMPOSER_AUTH env variable"
             echo "See: https://docs.platform.sh/guides/general/composer-auth.html#set-the-envcomposer_auth-project-variable"
         fi
-
-        composer install --no-dev --prefer-dist --no-progress --no-interaction --optimize-autoloader
+
+        curl -fs https://get.symfony.com/cloud/configurator | bash
+
+        NODE_VERSION=v22.16.0 symfony-build
 
     # Deploy hook, access to services & done once (per cluster, not per node), only mounts are writable at this point
     # Note: Http traffic is paused while this is running, so for prod code this should finish as fast as possible, < 30s
     deploy: |
         set -e
+
+        symfony-deploy
 
         if [ ! -f public/var/.platform.installed ]; then
             # Configure ElasticSearch mappings
@@ -178,9 +182,10 @@ hooks:
             rm -Rf var/cache/$APP_ENV/*
             php bin/console cache:pool:clear cache.redis
             sh bin/platformsh_prestart_cacheclear.sh
-            SKIP_HTTPCACHE_PURGE="1" php -d memory_limit=-1 bin/console ibexa:install
+            SKIP_HTTPCACHE_PURGE="1" php -d memory_limit=-1 bin/console ibexa:install --no-interaction
             unset SKIP_HTTPCACHE_PURGE
-            php bin/console ibexa:graphql:generate-schema
+            # If you use GraphQL, uncomment this to generate the schema
+            ##php bin/console ibexa:graphql:generate-schema
 
             touch public/var/.platform.installed
         fi