Merge pull request #117 from akunzai/update-dependencies

Update dependencies
akunzai · Dec 20, 2024 · 569a007 · 569a007
2 parents e554415 + b6d0be3
commit 569a007
Show file tree

Hide file tree

Showing 5 changed files with 2,679 additions and 2,228 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
   "service": "joomla",
   "workspaceFolder": "/workspace",
   "postCreateCommand": "sudo usermod -aG www-data vscode",
-  "postAttachCommand": "newgrp www-data",
+  "postAttachCommand": "newgrp www-data; composer config -g repositories.firegento composer https://packages.firegento.com",
   "remoteUser": "vscode",
   "remoteEnv": {
     "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"

diff --git a/.devcontainer/joomla/Dockerfile b/.devcontainer/joomla/Dockerfile
@@ -20,15 +20,15 @@ RUN --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
     # install the PHP extensions we need
     savedAptMark="$(apt-mark showmanual)"; \
     apt-get install -y --no-install-recommends \
-    libfreetype6-dev libicu-dev \
+    libfreetype6-dev libicu-dev libssl-dev \
     libjpeg62-turbo-dev libpng-dev \
     libxml2-dev libxslt1-dev \
     libzip-dev libwebp-dev \
     ${PHP_EXTRA_BUILD_DEPS:-}; \
     # https://www.php.net/manual/en/image.installation.php
     docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp; \
-    docker-php-ext-install -j$(nproc) opcache \
-    intl gd mysqli pcntl pdo_mysql soap xsl zip; \
+    docker-php-ext-install -j$(nproc) ftp \
+    gd intl mysqli opcache pcntl pdo_mysql soap xsl zip; \
     curl -Lo /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar && \
     chmod +x /usr/local/bin/pickle; \
     pickle install --no-interaction apcu-stable; \

diff --git a/.devcontainer/openmage/Dockerfile b/.devcontainer/openmage/Dockerfile
@@ -2,7 +2,7 @@
 # https://github.com/OpenMage/magento-lts/tree/main/dev/openmage
 ARG PHP_VERSION=8.3
 ARG PHP_EXTRA_BUILD_DEPS=""
-ARG OPENMAGE_VERSION=20.10.2
+ARG OPENMAGE_VERSION=20.11.0
 
 # https://github.com/OpenMage/magento-lts/blob/main/.github/workflows/release.yml
 FROM composer AS builder
@@ -32,16 +32,16 @@ RUN --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
     # install the PHP extensions we need
     savedAptMark="$(apt-mark showmanual)"; \
     apt-get install -y --no-install-recommends \
-    libonig-dev \
+    libonig-dev libssl-dev \
     libfreetype6-dev libicu-dev \
     libjpeg62-turbo-dev libpng-dev \
     libxml2-dev libxslt1-dev \
     libzip-dev libwebp-dev \
     ${PHP_EXTRA_BUILD_DEPS:-}; \
     # https://www.php.net/manual/en/image.installation.php
     docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp; \
-    docker-php-ext-install -j$(nproc) opcache \
-    intl gd mysqli pcntl pdo_mysql soap xsl zip; \
+    docker-php-ext-install -j$(nproc) ftp \
+    gd intl mysqli opcache pcntl pdo_mysql soap xsl zip; \
     curl -Lo /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar && \
     chmod +x /usr/local/bin/pickle; \
     pickle install --no-interaction apcu-stable; \

diff --git a/composer.json b/composer.json
@@ -15,8 +15,10 @@
     ],
     "config": {
         "allow-plugins": {
+            "aydin-hassan/magento-core-composer-installer": true,
             "cweagans/composer-patches": true,
             "magento-hackathon/magento-composer-installer": true,
+            "openmage/composer-plugin": true,
             "phpstan/extension-installer": true
         },
         "preferred-install": "dist",
@@ -27,15 +29,15 @@
             "type": "package",
             "package": {
                 "name": "joomla/joomla-cms",
-                "version": "5.2.1",
+                "version": "5.2.2",
                 "dist": {
-                    "url": "https://github.com/joomla/joomla-cms/releases/download/5.2.1/Joomla_5.2.1-Stable-Full_Package.zip",
+                    "url": "https://github.com/joomla/joomla-cms/releases/download/5.2.2/Joomla_5.2.2-Stable-Full_Package.zip",
                     "type": "zip"
                 },
                 "source": {
                     "url": "https://github.com/joomla/joomla-cms.git",
                     "type": "git",
-                    "reference": "tags/5.2.1"
+                    "reference": "tags/5.2.2"
                 }
             }
         },
@@ -54,19 +56,21 @@
     ],
     "require": {
         "php": ">=8.1",
-        "magento-hackathon/magento-composer-installer": "^4.0.2"
+        "aydin-hassan/magento-core-composer-installer": "~2.1.0"
     },
     "require-dev": {
         "akunzai/joomla-stubs": "dev-master",
         "friendsofphp/php-cs-fixer": "^3.65",
-        "joomla/joomla-cms": "5.2.1",
-        "openmage/magento-lts": "^20.10",
+        "joomla/joomla-cms": "5.2.2",
+        "openmage/magento-lts": "^20.11",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^2.0",
         "phpstan/phpstan-deprecation-rules": "^2.0"
     },
     "extra": {
-        "magento-root-dir": "vendor/openmage/magento-lts"
+        "magento-root-dir": "vendor/openmage/magento-lts",
+        "enable-patching": true,
+        "magento-core-package-type": "magento-source"
     },
     "prefer-stable": true,
     "scripts": {