Merge pull request #335 from PrestaShop/develop

Merge `develop` into `master`
PrestaShop · Jan 6, 2025 · f11b77f · f11b77f
2 parents 605fda0 + c0ca42d
commit f11b77f
Show file tree

Hide file tree

Showing 3 changed files with 713 additions and 436 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -43,4 +43,5 @@ RUN mv /var/www/html/vhost.conf /etc/apache2/sites-enabled/000-default.conf && \
 
 RUN sed -i 's/^max_execution_time = .*/max_execution_time = 3600/'  /usr/local/etc/php/php.ini-production && \ 
     sed -i 's/variables_order = "GPCS"/variables_order = "EGPCS"/' /usr/local/etc/php/php.ini-production && \ 
+    sed -i 's/memory_limit = 128M/memory_limit = 192M/' /usr/local/etc/php/php.ini-production && \ 
     mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
diff --git a/composer.json b/composer.json
@@ -12,20 +12,20 @@
         "doctrine/doctrine-migrations-bundle": "^3.3",
         "doctrine/orm": "^3.1",
         "symfony/apache-pack": "^1.0",
-        "symfony/console": "~7.1.0",
-        "symfony/dotenv": "~7.1.0",
+        "symfony/console": "~7.2.0",
+        "symfony/dotenv": "~7.2.0",
         "symfony/flex": "^2",
-        "symfony/framework-bundle": "~7.1.0",
-        "symfony/runtime": "~7.1.0",
-        "symfony/yaml": "~7.1.0"
+        "symfony/framework-bundle": "~7.2.0",
+        "symfony/runtime": "~7.2.0",
+        "symfony/yaml": "~7.2.0"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.41",
         "friendsofphp/php-cs-fixer": "^3.65",
         "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^11.0",
-        "symfony/browser-kit": "~7.1.0",
-        "symfony/css-selector": "~7.1.0",
+        "symfony/browser-kit": "~7.2.0",
+        "symfony/css-selector": "~7.2.0",
         "symfony/maker-bundle": "^1.52",
         "symfony/phpunit-bridge": "^7.0"
     },