Skip to content

Commit 7d69f6d

Browse files
Merge pull request #9605 from magento-gl/arrows_platform_health_02192025
[Arrows] - Replace laminas/laminas-oauth and laminas/laminas-file with alternative
2 parents c699c20 + 1dd0638 commit 7d69f6d

File tree

15 files changed

+774
-585
lines changed

15 files changed

+774
-585
lines changed

app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php

-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
namespace Magento\Catalog\Model\Product\Option\Type\File;
99

10-
use Laminas\Filter\File\Rename;
11-
use Laminas\File\Transfer\Exception\PhpEnvironmentException;
1210
use Magento\Catalog\Model\Product;
1311
use Magento\Catalog\Model\Product\Exception as ProductException;
1412
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -126,7 +124,6 @@ public function setProduct(Product $product)
126124
* @throws \Exception
127125
* @throws \Magento\Framework\Exception\InputException
128126
* @throws \Magento\Framework\Validator\Exception
129-
* @throws PhpEnvironmentException
130127
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
131128
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
132129
*/
@@ -184,8 +181,6 @@ public function validate($processingParams, $option)
184181
$filePath = $dispersion . '/' . $fileName;
185182
$fileFullPath = $this->mediaDirectory->getAbsolutePath($this->quotePath . $filePath);
186183

187-
$upload->addFilter(new Rename(['target' => $fileFullPath, 'overwrite' => true]));
188-
189184
if ($this->product !== null) {
190185
$this->product->getTypeInstance()->addFileQueue(
191186
[

app/code/Magento/ImportExport/Model/Source/Upload.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

88
namespace Magento\ImportExport\Model\Source;
99

10-
use Laminas\File\Transfer\Adapter\Http;
10+
use Magento\Framework\File\HttpInterface as Http;
1111
use Laminas\Validator\File\Upload as FileUploadValidator;
1212
use Magento\Framework\App\Filesystem\DirectoryList;
1313
use Magento\Framework\Exception\LocalizedException;

app/code/Magento/ImportExport/Test/Unit/Model/Source/UploadTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

88
namespace Magento\ImportExport\Test\Unit\Model\Source;
99

10-
use Laminas\File\Transfer\Adapter\Http;
10+
use Magento\Framework\File\Http;
1111
use Magento\Framework\Filesystem;
1212
use Magento\Framework\Filesystem\Directory\WriteInterface;
1313
use Magento\Framework\HTTP\Adapter\FileTransferFactory;

app/etc/di.xml

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<preference for="Magento\Framework\App\Route\ConfigInterface" type="Magento\Framework\App\Route\Config" />
7676
<preference for="Magento\Framework\App\ResourceConnection\ConfigInterface" type="Magento\Framework\App\ResourceConnection\Config\Proxy" />
7777
<preference for="Magento\Framework\Oauth\OauthInterface" type="Magento\Framework\Oauth\Oauth"/>
78+
<preference for="Magento\Framework\Oauth\Helper\Signature\HmacInterface" type="Magento\Framework\Oauth\Helper\Signature\Hmac" />
7879
<preference for="Magento\Framework\View\Design\Theme\Domain\PhysicalInterface" type="Magento\Theme\Model\Theme\Domain\Physical" />
7980
<preference for="Magento\Framework\View\Design\Theme\Domain\VirtualInterface" type="Magento\Theme\Model\Theme\Domain\Virtual" />
8081
<preference for="Magento\Framework\View\Design\Theme\Domain\StagingInterface" type="Magento\Theme\Model\Theme\Domain\Staging" />

composer.json

-2
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,11 @@
5959
"laminas/laminas-escaper": "^2.13",
6060
"laminas/laminas-eventmanager": "^3.11",
6161
"laminas/laminas-feed": "^2.22",
62-
"magento/laminas-file": "^1.0.0",
6362
"laminas/laminas-filter": "^2.33",
6463
"laminas/laminas-http": "^2.15",
6564
"laminas/laminas-i18n": "^2.17",
6665
"laminas/laminas-modulemanager": "^2.11",
6766
"laminas/laminas-mvc": "^3.6",
68-
"magento/laminas-oauth": "^1.0.0",
6967
"laminas/laminas-permissions-acl": "^2.10",
7068
"laminas/laminas-servicemanager": "^3.16",
7169
"laminas/laminas-soap": "^2.10",

0 commit comments

Comments
 (0)