Merge MC-31652 into 2.4-bugfixes-100620

Author: dvoskoboinikov

dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php

@@ -7,15 +7,17 @@
  */
 namespace Magento\Framework\Filesystem\Directory;
 
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem\DriverPool;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ReadTest
  * Test for Magento\Framework\Filesystem\Directory\Read class
  */
-class WriteTest extends \PHPUnit\Framework\TestCase
+class WriteTest extends TestCase
 {
     /**
      * Test data to be cleaned
@@ -41,6 +43,8 @@ public function testInstance()
      * @param string $basePath
      * @param int $permissions
      * @param string $path
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testCreate($basePath, $permissions, $path)
     {
@@ -64,6 +68,11 @@ public function createProvider()
         ];
     }
 
+    /**
+     * Test for create outside
+     *
+     * @throws FileSystemException
+     */
     public function testCreateOutside()
     {
         $exceptions = 0;
@@ -91,6 +100,8 @@ public function testCreateOutside()
      *
      * @dataProvider deleteProvider
      * @param string $path
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testDelete($path)
     {
@@ -111,6 +122,11 @@ public function deleteProvider()
         return [['subdir'], ['subdir/subsubdir']];
     }
 
+    /**
+     * Test for delete outside
+     *
+     * @throws FileSystemException
+     */
     public function testDeleteOutside()
     {
         $exceptions = 0;
@@ -141,6 +157,8 @@ public function testDeleteOutside()
      * @param int $permissions
      * @param string $name
      * @param string $newName
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testRename($basePath, $permissions, $name, $newName)
     {
@@ -164,6 +182,11 @@ public function renameProvider()
         return [['newDir1', 0777, 'first_name.txt', 'second_name.txt']];
     }
 
+    /**
+     * Test for rename outside
+     *
+     * @throws FileSystemException
+     */
     public function testRenameOutside()
     {
         $exceptions = 0;
@@ -198,6 +221,8 @@ public function testRenameOutside()
      * @param int $permission
      * @param string $name
      * @param string $newName
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testRenameTargetDir($firstDir, $secondDir, $permission, $name, $newName)
     {
@@ -231,6 +256,8 @@ public function renameTargetDirProvider()
      * @param int $permissions
      * @param string $name
      * @param string $newName
+     * @throws ValidatorException
+     * @throws FileSystemException
      */
     public function testCopy($basePath, $permissions, $name, $newName)
     {
@@ -255,6 +282,11 @@ public function copyProvider()
         ];
     }
 
+    /**
+     * Test for copy outside
+     *
+     * @throws FileSystemException|ValidatorException
+     */
     public function testCopyOutside()
     {
         $exceptions = 0;
@@ -298,6 +330,8 @@ public function testCopyOutside()
      * @param int $permission
      * @param string $name
      * @param string $newName
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testCopyTargetDir($firstDir, $secondDir, $permission, $name, $newName)
     {
@@ -327,6 +361,8 @@ public function copyTargetDirProvider()
 
     /**
      * Test for changePermissions method
+     *
+     * @throws FileSystemException|ValidatorException
      */
     public function testChangePermissions()
     {
@@ -335,6 +371,11 @@ public function testChangePermissions()
         $this->assertTrue($directory->changePermissions('test_directory', 0644));
     }
 
+    /**
+     * Test for changePermissions outside
+     *
+     * @throws FileSystemException
+     */
     public function testChangePermissionsOutside()
     {
         $exceptions = 0;
@@ -359,6 +400,8 @@ public function testChangePermissionsOutside()
 
     /**
      * Test for changePermissionsRecursively method
+     *
+     * @throws FileSystemException|ValidatorException
      */
     public function testChangePermissionsRecursively()
     {
@@ -370,6 +413,11 @@ public function testChangePermissionsRecursively()
         $this->assertTrue($directory->changePermissionsRecursively('test_directory', 0777, 0644));
     }
 
+    /**
+     * Test for changePermissionsRecursively outside
+     *
+     * @throws FileSystemException
+     */
     public function testChangePermissionsRecursivelyOutside()
     {
         $exceptions = 0;
@@ -400,6 +448,8 @@ public function testChangePermissionsRecursivelyOutside()
      * @param int $permissions
      * @param string $path
      * @param int $time
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testTouch($basePath, $permissions, $path, $time)
     {
@@ -422,6 +472,11 @@ public function touchProvider()
         ];
     }
 
+    /**
+     * Test for touch outside
+     *
+     * @throws FileSystemException
+     */
     public function testTouchOutside()
     {
         $exceptions = 0;
@@ -446,6 +501,8 @@ public function testTouchOutside()
 
     /**
      * Test isWritable method
+     *
+     * @throws FileSystemException|ValidatorException
      */
     public function testIsWritable()
     {
@@ -455,6 +512,11 @@ public function testIsWritable()
         $this->assertTrue($directory->isWritable('bar'));
     }
 
+    /**
+     * Test isWritable method outside
+     *
+     * @throws FileSystemException
+     */
     public function testIsWritableOutside()
     {
         $exceptions = 0;
@@ -485,6 +547,8 @@ public function testIsWritableOutside()
      * @param int $permissions
      * @param string $path
      * @param string $mode
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testOpenFile($basePath, $permissions, $path, $mode)
     {
@@ -507,6 +571,11 @@ public function openFileProvider()
         ];
     }
 
+    /**
+     * Test for openFile outside
+     *
+     * @throws FileSystemException
+     */
     public function testOpenFileOutside()
     {
         $exceptions = 0;
@@ -536,6 +605,8 @@ public function testOpenFileOutside()
      * @param string $path
      * @param string $content
      * @param string $extraContent
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testWriteFile($path, $content, $extraContent)
     {
@@ -553,6 +624,8 @@ public function testWriteFile($path, $content, $extraContent)
      * @param string $path
      * @param string $content
      * @param string $extraContent
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testWriteFileAppend($path, $content, $extraContent)
     {
@@ -573,6 +646,11 @@ public function writeFileProvider()
         return [['file1', '123', '456'], ['folder1/file1', '123', '456']];
     }
 
+    /**
+     * Test for writeFile outside
+     *
+     * @throws FileSystemException
+     */
     public function testWriteFileOutside()
     {
         $exceptions = 0;
@@ -595,8 +673,24 @@ public function testWriteFileOutside()
         $this->assertEquals(3, $exceptions);
     }
 
+    /**
+     * Test for invalidDeletePath
+     *
+     * @throws ValidatorException
+     */
+    public function testInvalidDeletePath()
+    {
+        $this->expectException(FileSystemException::class);
+        $directory = $this->getDirectoryInstance('newDir', 0777);
+        $invalidPath = 'invalidPath/../';
+        $directory->create($invalidPath);
+        $directory->delete($invalidPath);
+    }
+
     /**
      * Tear down
+     *
+     * @throws ValidatorException|FileSystemException
      */
     protected function tearDown(): void
     {
@@ -620,8 +714,8 @@ private function getDirectoryInstance($path, $permissions)
     {
         $fullPath = __DIR__ . '/../_files/' . $path;
         $objectManager = Bootstrap::getObjectManager();
-        /** @var \Magento\Framework\Filesystem\Directory\WriteFactory $directoryFactory */
-        $directoryFactory = $objectManager->create(\Magento\Framework\Filesystem\Directory\WriteFactory::class);
+        /** @var WriteFactory $directoryFactory */
+        $directoryFactory = $objectManager->create(WriteFactory::class);
         $directory = $directoryFactory->create($fullPath, DriverPool::FILE, $permissions);
         $this->testDirectories[] = $directory;
         return $directory;