Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 327e0af
Merge: 9883ee7 ca2f376
Author: Jonathan Lelievre <[email protected]>
Date:   Thu Oct 24 11:54:01 2024 +0200

    Merge pull request PrestaShop#37233 from jolelievre/merge-90x-241024

    Merge 9.0.x 24/10/24

commit ca2f376
Merge: 9883ee7 ad7da12
Author: Jonathan LELIEVRE <[email protected]>
Date:   Thu Oct 24 09:56:41 2024 +0200

    Merge branch '9.0.x' into merge-90x-241024

commit ad7da12
Merge: 56742d1 0dc7d04
Author: Jonathan Lelievre <[email protected]>
Date:   Wed Oct 23 20:11:02 2024 +0200

    Merge pull request PrestaShop#37203 from Progi1984/uiTestsStabilization

    Functional Tests : Stabilization

commit 0dc7d04
Author: Progi1984 <[email protected]>
Date:   Mon Oct 21 11:58:22 2024 +0200

    Functional Tests : Stabilization

commit 56742d1
Merge: 39882cc b951733
Author: Progi1984 <[email protected]>
Date:   Wed Oct 23 17:49:26 2024 +0200

    Merge pull request PrestaShop#37226 from jolelievre/stabilize-change-position

    Stabilise UI tests changing positions

commit b951733
Author: Jonathan LELIEVRE <[email protected]>
Date:   Wed Oct 23 16:00:27 2024 +0200

    Change the drag and drop method used to modify the positions to make it more stable

commit 39882cc
Merge: 320f0f8 616ca86
Author: Boris Hermans <[email protected]>
Date:   Wed Oct 23 11:37:44 2024 +0200

    Merge pull request PrestaShop#37208 from jolelievre/product-category-filter

commit 320f0f8
Merge: 65581bd bb980a2
Author: Jonathan Lelievre <[email protected]>
Date:   Tue Oct 22 15:58:18 2024 +0200

    Merge pull request PrestaShop#37214 from PululuK/fix-tests-mocked-context-country

    Fix tests `ContextMocker` wrong country config var

commit bb980a2
Author: PululuK <[email protected]>
Date:   Tue Oct 22 10:37:49 2024 +0200

    Fix tests `ContextMocker` wrogn country config var

commit 65581bd
Merge: 53d2b70 30d009f
Author: Daniel Hlaváček <[email protected]>
Date:   Tue Oct 22 12:35:56 2024 +0200

    Merge pull request PrestaShop#36877 from Hlavtox/fix-category-images

    Fix category thumbnail images

commit 53d2b70
Merge: 605ea07 fe0524d
Author: Jonathan Lelievre <[email protected]>
Date:   Tue Oct 22 11:32:50 2024 +0200

    Merge pull request PrestaShop#37169 from jinpresta/reset-module-cqrs

    Reset module CQRS Command

commit 605ea07
Merge: 3b6d9b7 9893dce
Author: Jonathan Lelievre <[email protected]>
Date:   Tue Oct 22 10:50:08 2024 +0200

    Merge pull request PrestaShop#36703 from Hlavtox/handle-choice-duplicates

    Handle form choice duplicates

commit 3b6d9b7
Merge: 04fc048 8030030
Author: Krystian Podemski <[email protected]>
Date:   Tue Oct 22 10:31:40 2024 +0200

    Merge pull request PrestaShop#37156 from nicosomb/upgrade-blockwishlist

    Updated blockwishlist to 3.0.2

commit 616ca86
Author: Jonathan LELIEVRE <[email protected]>
Date:   Tue Oct 22 00:30:55 2024 +0200

    Handle special case of reset button in product grid

commit 04fc048
Merge: b99c108 42a1e14
Author: Jonathan Lelievre <[email protected]>
Date:   Mon Oct 21 23:37:33 2024 +0200

    Merge pull request PrestaShop#37158 from jolelievre/refacto-advanced-configuration-controllers

    Refacto Advanced configuration controllers

commit 9883ee7
Merge: 5618841 ad640ad
Author: Jonathan Lelievre <[email protected]>
Date:   Mon Oct 21 21:21:11 2024 +0200

    Merge pull request PrestaShop#37193 from jolelievre/merge-90x-191024

    Merge 9.0.x 19/10/24

commit fe0524d
Author: Jin JI <[email protected]>
Date:   Wed Oct 16 15:45:26 2024 +0200

    Add ResetModuleCommand for module API, update ps_apiresources module to test new API endpoint

commit b99c108
Merge: 4f04ef8 18c102b
Author: Boris Hermans <[email protected]>
Date:   Mon Oct 21 17:50:41 2024 +0200

    Merge pull request PrestaShop#37160 from boherm/PrestaShop#37136-refacto-improve-international-prestashopadmincontroller

commit 30d009f
Author: Hlavtox <[email protected]>
Date:   Tue Sep 10 11:19:52 2024 +0200

    Fix category images

commit 4f04ef8
Merge: 42b15df a8265ca
Author: Jonathan Lelievre <[email protected]>
Date:   Mon Oct 21 14:35:27 2024 +0200

    Merge pull request PrestaShop#35843 from Kaikina/issue-35837

    Add a file separator input to the sql manager settings

commit 42a1e14
Author: Jonathan LELIEVRE <[email protected]>
Date:   Mon Oct 21 12:44:24 2024 +0200

    Refacto WebserviceController based on PrestaShopAdminController

commit 559b32d
Author: Jonathan LELIEVRE <[email protected]>
Date:   Mon Oct 21 12:15:59 2024 +0200

    Refacto SystemInformationController based on PrestaShopAdminController

commit bb8c622
Author: Jonathan LELIEVRE <[email protected]>
Date:   Mon Oct 21 12:08:27 2024 +0200

    Refacto SqlManagerController based on PrestaShopAdminController

commit 1131be6
Author: Jonathan LELIEVRE <[email protected]>
Date:   Mon Oct 21 11:52:28 2024 +0200

    Refact ShopController based on PrestaShopAdminController

commit 8072afe
Author: Jonathan LELIEVRE <[email protected]>
Date:   Mon Oct 21 11:47:53 2024 +0200

    Refacto SecurityController based on PrestaShopAdminController

commit a8265ca
Author: Jean-François Viguier <[email protected]>
Date:   Mon Oct 21 11:45:53 2024 +0200

    bug fix on deleted getFileSeparator

commit 9893dce
Author: Daniel Hlaváček <[email protected]>
Date:   Mon Oct 21 11:44:03 2024 +0200

    Fix CS

commit a288680
Author: Jean-François Viguier <[email protected]>
Date:   Mon Oct 21 11:38:04 2024 +0200

    Delete getFileSeparator

    Co-authored-by: Jonathan Lelievre <[email protected]>

commit 932b3b9
Author: Jean-François Viguier <[email protected]>
Date:   Mon Oct 21 11:37:43 2024 +0200

    Delete getFileSeparatorValue

    Co-authored-by: Jonathan Lelievre <[email protected]>

commit 6955500
Author: Jonathan LELIEVRE <[email protected]>
Date:   Mon Oct 21 11:34:29 2024 +0200

    Refacto PermissionController based on PrestaShopAdminController

commit 4d753fd
Author: Jean-François Viguier <[email protected]>
Date:   Mon Oct 21 11:34:21 2024 +0200

    Suggestion from Jo 2

    Co-authored-by: Jonathan Lelievre <[email protected]>

commit 8fc4ed4
Author: Jean-François Viguier <[email protected]>
Date:   Mon Oct 21 11:34:07 2024 +0200

    Suggestion from Jo 1

    Co-authored-by: Jonathan Lelievre <[email protected]>

commit 34f3425
Author: Jonathan LELIEVRE <[email protected]>
Date:   Thu Oct 17 18:48:07 2024 +0200

    Refacto ProfileController based on PrestaShopAdminController

commit f5c26cb
Author: Jonathan LELIEVRE <[email protected]>
Date:   Thu Oct 17 18:26:33 2024 +0200

    Refacto PerformanceController and MemcacheController based on PrestaShopAdminController

commit 9ad9533
Author: Jonathan LELIEVRE <[email protected]>
Date:   Thu Oct 17 17:39:01 2024 +0200

    Refacto LogsController based on PrestaShopAdminController

commit d00b3e5
Author: Jonathan LELIEVRE <[email protected]>
Date:   Thu Oct 17 17:24:48 2024 +0200

    Refacto ImproveController and ImportDataConfigurationController based on PrestaShopAdminController

commit c2fc2d6
Author: Jonathan LELIEVRE <[email protected]>
Date:   Thu Oct 17 16:29:27 2024 +0200

    Refacto FeatureFlagController based on PrestaShopAdminController

commit f1111a0
Author: Jonathan LELIEVRE <[email protected]>
Date:   Thu Oct 17 11:11:52 2024 +0200

    Refacto EmployeeController based on PrestaShopAdminController

commit 946e98c
Author: Jonathan LELIEVRE <[email protected]>
Date:   Thu Oct 17 10:39:50 2024 +0200

    Refacto EmailController based on PrestaShopAdminController

commit 20b0cdf
Author: Jonathan LELIEVRE <[email protected]>
Date:   Thu Oct 17 10:25:54 2024 +0200

    Refacto BackupController based on PrestaShopAdminController

commit 1957573
Author: Jonathan LELIEVRE <[email protected]>
Date:   Thu Oct 17 10:08:48 2024 +0200

    Refacto AdmnistrationController based on PrestaShopAdminController

commit f652419
Author: Jonathan LELIEVRE <[email protected]>
Date:   Tue Oct 15 19:07:25 2024 +0200

    Refacto AdminAPIController based on PrestaShopAdminController

commit 18c102b
Author: boherm <[email protected]>
Date:   Wed Oct 16 09:31:49 2024 +0200

    Add ignore phpstan errors

commit 6c337c3
Author: boherm <[email protected]>
Date:   Wed Oct 16 09:31:31 2024 +0200

    Refacto improve > international controllers with PrestaShopAdminController

commit 42b15df
Merge: ad640ad 94ac425
Author: Krystian Podemski <[email protected]>
Date:   Sun Oct 20 14:33:57 2024 +0200

    Merge pull request PrestaShop#37167 from Prestaworks/security_improvement

    Improve security by randomizing prefix

commit ad640ad
Merge: 3531fc2 7c936d6
Author: Jonathan Lelievre <[email protected]>
Date:   Sat Oct 19 12:04:52 2024 +0200

    Merge pull request PrestaShop#37188 from tleon/add-version-in-workflow

    Add new version in workflows

commit 3531fc2
Merge: 5618841 228a7c0
Author: Jonathan Lelievre <[email protected]>
Date:   Fri Oct 18 17:50:43 2024 +0200

    Merge pull request PrestaShop#35935 from Progi1984/uiTestsRemovePlaywright

    Functional Tests : Remove playwright dependency

commit 228a7c0
Author: Progi1984 <[email protected]>
Date:   Fri Oct 18 16:03:02 2024 +0200

    Functional Tests : Remove playwright dependency

commit 7c936d6
Author: tleon <[email protected]>
Date:   Fri Oct 18 15:49:43 2024 +0200

    fixed based version of the change

commit a17f914
Author: Jean-François Viguier <[email protected]>
Date:   Fri Oct 18 15:17:17 2024 +0200

    limit file separator to 1 character, field required

commit 94ac425
Author: Prestaworks <[email protected]>
Date:   Thu Oct 3 14:02:58 2024 +0200

    Update database.php

    Update database.php

    Update database.php

    remove capital letters

commit ca14fa9
Author: tleon <[email protected]>
Date:   Fri Oct 18 10:47:44 2024 +0200

    add new version in workflows

commit 8030030
Author: Nicolas Lœuillet <[email protected]>
Date:   Thu Oct 17 13:32:39 2024 +0200

    Skipped test

commit 745754f
Author: Nicolas Lœuillet <[email protected]>
Date:   Thu Oct 17 11:37:59 2024 +0200

    Skipped test

commit 4b3482b
Author: boherm <[email protected]>
Date:   Wed Oct 16 09:31:00 2024 +0200

    Prepare some configuration yml files

commit 0530e43
Author: Nicolas Lœuillet <[email protected]>
Date:   Tue Oct 15 16:11:22 2024 +0200

    updated tests

commit 51b0b4a
Author: Nicolas Lœuillet <[email protected]>
Date:   Tue Oct 15 16:08:02 2024 +0200

    fixed test

commit 4f6af68
Author: Nicolas Lœuillet <[email protected]>
Date:   Tue Oct 15 15:57:47 2024 +0200

    updated tests

commit d67db77
Author: Nicolas Lœuillet <[email protected]>
Date:   Tue Oct 15 15:49:13 2024 +0200

    Updated blockwishlist

commit 2275e05
Author: nesrineabdmouleh <[email protected]>
Date:   Fri Oct 11 16:36:24 2024 +0200

    Fix UI tests

commit 4f239e5
Author: Hlavtox <[email protected]>
Date:   Tue Aug 13 16:50:44 2024 +0200

    Add FormChoiceFormatter

commit 804ada2
Author: tgirou <[email protected]>
Date:   Thu May 2 12:19:55 2024 +0200

    fix(issue-35837): Add file separator input to the sql manager settings
  • Loading branch information
@PululuK
PululuK committed Oct 24, 2024
1 parent 20e4352 commit d43fa2c
Show file tree
Hide file tree
Showing 1,068 changed files with 5,414 additions and 3,354 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull

| Questions | Answers
| ----------------- | -------------------------------------------------------
| Branch? | develop / 8.2.x
| Branch? | develop / 9.0.x / 8.2.x
| Description? | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
| Type? | bug fix / improvement / new feature / refacto
| Category? | FO / BO / CO / IN / WS / TE / LO / ME / PM / see explanations at https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#type--category
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/cron_js_routing.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ jobs:
matrix:
BRANCH:
- develop
- 9.0.x
- 8.2.x
- 8.1.x
- 8.0.x
include:
- BRANCH: develop
node: 16
- BRANCH: 8.1.x
node: 16
- BRANCH: 8.0.x
node: 20
- BRANCH: 9.0.x
node: 20
- BRANCH: 8.2.x
node: 16

env:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/cron_nightly_build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@ jobs:
matrix:
BRANCH:
- develop
- 9.0.x
- 8.2.x
- 8.1.x
- 8.0.x
- 1.7.8.x
include:
- BRANCH: develop
node: 16
node: 20
- BRANCH: 9.0.x
node: 20
- BRANCH: 8.2.x
node: 16
- BRANCH: 8.1.x
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/cron_nightly_tests_9.0.x_mariadb.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# This workflow aim to run all UI tests on active branches
# and upload the report on Google cloud platform storage
name: Nightly tests and report - 9.0.x

on:
workflow_run:
workflows: [ 'Nightly Build' ]
types:
- requested

jobs:
test_9_0_x:
uses: ./.github/workflows/cron_nightly_tests_reusable.yml
with:
BRANCH: 9.0.x
PHP_VERSION: '8.1'
NODE_VERSION: '20'
DB_SERVER: 'mariadb'
secrets:
GC_PROJECT_ID: ${{ secrets.GC_PROJECT_ID }}
GC_SERVICE_KEY: ${{ secrets.GC_SERVICE_KEY }}
21 changes: 21 additions & 0 deletions .github/workflows/cron_nightly_tests_9.0.x_mysql.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# This workflow aim to run all UI tests on active branches
# and upload the report on Google cloud platform storage
name: Nightly tests and report - 9.0.x

on:
workflow_run:
workflows: [ 'Nightly Build' ]
types:
- requested

jobs:
test_9_0_x:
uses: ./.github/workflows/cron_nightly_tests_reusable.yml
with:
BRANCH: 9.0.x
PHP_VERSION: '8.1'
NODE_VERSION: '20'
DB_SERVER: 'mysql'
secrets:
GC_PROJECT_ID: ${{ secrets.GC_PROJECT_ID }}
GC_SERVICE_KEY: ${{ secrets.GC_SERVICE_KEY }}
4 changes: 4 additions & 0 deletions .github/workflows/cron_nightly_tests_reports.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ jobs:
database: mysql
- branch: 8.2.x
database: mysql
- branch: 9.0.x
database: mysql
- branch: 9.0.x
database: mariadb
- branch: develop
database: mysql
- branch: develop
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/cron_nightly_tests_reusable.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,17 @@ jobs:
CAMPAIGN: 'functional:FO:hummingbird:04-07'
- BRANCH: 8.2.x
CAMPAIGN: 'functional:FO:hummingbird:08-12'
## 9.0.x
- BRANCH: 9.0.x
CAMPAIGN: 'functional:FO:01-03'
- BRANCH: 9.0.x
CAMPAIGN: 'functional:FO:04-07'
- BRANCH: 9.0.x
CAMPAIGN: 'functional:FO:08-12'
- BRANCH: 9.0.x
CAMPAIGN: 'sanity:productV2'
- BRANCH: 9.0.x
CAMPAIGN: 'functional:productV2'
## develop
- BRANCH: develop
CAMPAIGN: 'functional:FO:01-03'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/cron_php_update_modules.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
matrix:
BRANCH:
- develop
- 9.0.x
- 8.2.x
env:
GH_BRANCH: ${{ matrix.BRANCH }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/sanity.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ jobs:

- name: Run Tests
uses: ./.github/actions/ui-test
env:
## Improve Webkit stability
## Link : https://github.com/microsoft/playwright/issues/23899
GDK_BACKEND: x11
with:
TEST_CAMPAIGN: ${{ env.TEST_CAMPAIGN }}
BROWSER: ${{ matrix.browser }}
Expand Down
8 changes: 1 addition & 7 deletions classes/Image.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/

use PrestaShop\PrestaShop\Adapter\ServiceLocator;
use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
Expand Down Expand Up @@ -632,13 +631,8 @@ public function deleteImage($forceDelete = false)

// Delete auto-generated images
$image_types = ImageType::getImagesTypes();

// Get image formats we will be deleting. It would probably be easier to use ImageFormatConfiguration::SUPPORTED_FORMATS,
// but we want to avoid any behavior change in minor/patch version.
$configuredImageFormats = ServiceLocator::get(ImageFormatConfiguration::class)->getGenerationFormats();

foreach ($image_types as $imageType) {
foreach ($configuredImageFormats as $imageFormat) {
foreach (ImageFormatConfiguration::SUPPORTED_FORMATS as $imageFormat) {
$filesToDelete = $this->deleteAutoGeneratedImage($imageType, $imageFormat, $filesToDelete);
}
}
Expand Down
6 changes: 1 addition & 5 deletions classes/ObjectModel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1854,18 +1854,14 @@ public function deleteImage($force_delete = false)
return false;
}

// Get image formats we will be deleting. It would probably be easier to use ImageFormatConfiguration::SUPPORTED_FORMATS,
// but we want to avoid any behavior change in minor/patch version.
$configuredImageFormats = ServiceLocator::get(ImageFormatConfiguration::class)->getGenerationFormats();
$types = ImageType::getImagesTypes();

foreach ($types as $image_type) {
if (file_exists($this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $this->image_format)
&& !unlink($this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $this->image_format)) {
return false;
}

foreach ($configuredImageFormats as $imageFormat) {
foreach (ImageFormatConfiguration::SUPPORTED_FORMATS as $imageFormat) {
$file = $this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $imageFormat;
if (file_exists($file)) {
unlink($file);
Expand Down
10 changes: 6 additions & 4 deletions classes/Tools.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2282,7 +2282,7 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,

if ($rewrite_settings) {
// Compatibility with the old image filesystem
fwrite($write_fd, "# Images\n");
fwrite($write_fd, "# Rewrites for product images (support up to < 10 million images)\n");

// Rewrite product images < 10 millions
$path_components = [];
Expand All @@ -2293,12 +2293,14 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
fwrite($write_fd, $domain_rewrite_cond);
fwrite($write_fd, 'RewriteRule ^(' . str_repeat('([\d])', $i) . '(?:\-[\w-]*)?)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/p/' . $path . '/$1$' . ($i + 2) . " [L]\n");
}

fwrite($write_fd, "# Rewrites for category images\n");
fwrite($write_fd, $media_domains);
fwrite($write_fd, $domain_rewrite_cond);
fwrite($write_fd, 'RewriteRule ^c/([\d]+)(\-[\.*\w-]*)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/c/$1$2$3 [L]' . PHP_EOL);
fwrite($write_fd, 'RewriteRule ^c/([\d]+)(|_thumb)(\-[\.*\w-]*)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/c/$1$2$3$4 [L]' . PHP_EOL);
fwrite($write_fd, $media_domains);
fwrite($write_fd, $domain_rewrite_cond);
fwrite($write_fd, 'RewriteRule ^c/([a-zA-Z_-]+)(-[\d]+)?/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/c/$1$2$3 [L]' . PHP_EOL);
fwrite($write_fd, 'RewriteRule ^c/([a-zA-Z_-]+)(|_thumb)(-[\d]+)?/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/c/$1$2$3$4 [L]' . PHP_EOL);
}

fwrite($write_fd, "# AlphaImageLoader for IE and fancybox\n");
Expand All @@ -2309,7 +2311,7 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
}
// Redirections to dispatcher
if ($rewrite_settings) {
fwrite($write_fd, "\n# Dispatcher\n");
fwrite($write_fd, "\n# Send all other traffic to dispatcher\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -s [OR]\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -l [OR]\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -d\n");
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"prestashop/hummingbird": "dev-develop",
"prestashop/pagesnotfound": "^2",
"prestashop/productcomments": "^7.0",
"prestashop/ps_apiresources": "dev-update-module",
"prestashop/ps_apiresources": "dev-reset-module",
"prestashop/ps_banner": "^2",
"prestashop/ps_bestsellers": "^1.0",
"prestashop/ps_brandlist": "^1.0",
Expand Down Expand Up @@ -257,7 +257,7 @@
"repositories": {
"ps_apiresources": {
"type": "vcs",
"url": "https://github.com/jolelievre/ps_apiresources.git"
"url": "https://github.com/jinpresta/ps_apiresources.git"
}
},
"minimum-stability": "dev",
Expand Down
30 changes: 15 additions & 15 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion install-dev/controllers/http/database.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public function display(): void
$this->database_login = $parameters['parameters']['database_user'];
$this->database_password = $parameters['parameters']['database_password'];
$this->database_engine = $parameters['parameters']['database_engine'];
$this->database_prefix = substr(str_shuffle(str_repeat('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', mt_rand(1,10))), 0, 5).'_';
$this->database_prefix = substr(str_shuffle(str_repeat('0123456789abcdefghijklmnopqrstuvwxyz', mt_rand(1,10))), 0, 5).'_';

$this->database_clear = true;
$this->use_smtp = false;
Expand Down
3 changes: 3 additions & 0 deletions install-dev/data/xml/configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -897,5 +897,8 @@ Country</value>
<configuration id="PS_ADMIN_API_FORCE_DEBUG_SECURED" name="PS_ADMIN_API_FORCE_DEBUG_SECURED">
<value>1</value>
</configuration>
<configuration id="PS_SEPARATOR_FILE_MANAGER_SQL" name="PS_SEPARATOR_FILE_MANAGER_SQL">
<value>;</value>
</configuration>
</entities>
</entity_configuration>
2 changes: 2 additions & 0 deletions phpstan-disallowed-calls.neon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ parameters:
- src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderStateController.php
- src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php
- src/PrestaShopBundle/Controller/Admin/Improve/Design/MailThemeController.php
- src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
- src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
disallowedConstants:
-
constant:
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Backup/BackupRemover.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ final class BackupRemover implements BackupRemoverInterface
/**
* {@inheritdoc}
*/
public function remove(BackupInterface $backup)
public function remove(BackupInterface $backup): bool
{
$legacyBackup = new PrestaShopBackup($backup->getFileName());

Expand Down
3 changes: 2 additions & 1 deletion src/Adapter/Backup/DatabaseBackupCreator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Backup;

use PrestaShop\PrestaShop\Adapter\Entity\PrestaShopBackup;
use PrestaShop\PrestaShop\Core\Backup\BackupInterface;
use PrestaShop\PrestaShop\Core\Backup\Exception\BackupException;
use PrestaShop\PrestaShop\Core\Backup\Exception\DirectoryIsNotWritableException;
use PrestaShop\PrestaShop\Core\Backup\Manager\BackupCreatorInterface;
Expand All @@ -41,7 +42,7 @@ final class DatabaseBackupCreator implements BackupCreatorInterface
/**
* {@inheritdoc}
*/
public function createBackup()
public function createBackup(): BackupInterface
{
ini_set('max_execution_time', '0');

Expand Down
Loading

0 comments on commit d43fa2c

Please sign in to comment.