Merge pull request #35 from flagbit/bugfix/ASPHALT-615

[ASPHALT-615] fix upload for Mage 2.3.5
flagbit · Sep 28, 2020 · a3842c9 · a3842c9
2 parents ddf4404 + d982345
commit a3842c9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 32 deletions.
diff --git a/Block/Adminhtml/Filesystem/Content/Uploader.php b/Block/Adminhtml/Filesystem/Content/Uploader.php
@@ -31,7 +31,7 @@ protected function _construct()
         $type = $this->_getMediaType();
 
         $this->getConfig()->setUrl(
-            $this->_urlBuilder->addSessionParam()->getUrl('flagbit_flysystem/*/upload', ['type' => $type])
+            $this->_urlBuilder->getUrl('flagbit_flysystem/*/upload', ['type' => $type])
         )->setFileField(
             \Flagbit\Flysystem\Helper\Config::FLYSYSTEM_UPLOAD_ID
         );

diff --git a/Test/Unit/Block/Adminhtml/Filesystem/Content/UploaderTest.php b/Test/Unit/Block/Adminhtml/Filesystem/Content/UploaderTest.php
@@ -67,7 +67,7 @@ protected function setUp(): void
 
         $this->_urlBuilderMock = $this->getMockBuilder(Url::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getUrl', 'addSessionParam'])
+            ->setMethods(['getUrl'])
             ->getMock();
 
         $this->_mathRandomMock = $this->getMockBuilder(Random::class)
@@ -122,15 +122,6 @@ public function testContructor(): void
             ->withAnyParameters()
             ->willReturn($uniqueHash);
 
-        $this->_urlBuilderMock->expects($this->at(0))
-            ->method('addSessionParam')
-            ->willReturn($this->_urlBuilderMock);
-
-        $this->_urlBuilderMock->expects($this->at(1))
-            ->method('getUrl')
-            ->with('adminhtml/*/upload')
-            ->willReturn('asdf');
-
         $this->_formKeyMock->expects($this->once())
             ->method('getFormKey')
             ->willReturn($formKey);
@@ -140,11 +131,7 @@ public function testContructor(): void
             ->with('type')
             ->willReturn($mediaType);
 
-        $this->_urlBuilderMock->expects($this->at(2))
-            ->method('addSessionParam')
-            ->willReturn($this->_urlBuilderMock);
-
-        $this->_urlBuilderMock->expects($this->at(3))
+        $this->_urlBuilderMock->expects($this->at(1))
             ->method('getUrl')
             ->with($uri, $this->arrayHasKey('type'))
             ->willReturn($url);
@@ -168,24 +155,11 @@ public function testContructorWithMediaType(): void
             ->withAnyParameters()
             ->willReturn($uniqueHash);
 
-        $this->_urlBuilderMock->expects($this->at(0))
-            ->method('addSessionParam')
-            ->willReturn($this->_urlBuilderMock);
-
-        $this->_urlBuilderMock->expects($this->at(1))
-            ->method('getUrl')
-            ->with('adminhtml/*/upload')
-            ->willReturn('asdf');
-
         $this->_formKeyMock->expects($this->once())
             ->method('getFormKey')
             ->willReturn($formKey);
 
-        $this->_urlBuilderMock->expects($this->at(2))
-            ->method('addSessionParam')
-            ->willReturn($this->_urlBuilderMock);
-
-        $this->_urlBuilderMock->expects($this->at(3))
+        $this->_urlBuilderMock->expects($this->at(1))
             ->method('getUrl')
             ->with($uri, $this->arrayHasKey('type'))
             ->willReturn($url);
@@ -196,4 +170,4 @@ public function testContructorWithMediaType(): void
             ['media_type' => $mediaType]
         );
     }
-}
+}
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "php": ">=7.1.0",
         "league/flysystem": "^1.0",
         "league/flysystem-sftp": "^1.0",
-        "magento/framework": ">=101.0.0",
+        "magento/framework": ">=102.0.5",
         "magento/module-backend": ">=100.2.0",
         "magento/magento-composer-installer": "*"
     },