ENGCOM-6982: Move cache cleanup operation on state modification opera…

…tion #26916 - Merge Pull Request #26916 from kandy/magento2:filestat - Merged commits: 1. d9938c5 2. 48262c9 3. a0998fe
magento · Feb 25, 2020 · 5d8669f · 5d8669f
2 parents 2d46d98 + a0998fe
commit 5d8669f
Show file tree

Hide file tree

Showing 6 changed files with 1,074 additions and 56 deletions.
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
@@ -94,7 +94,7 @@ private function validateSpacingBetweenShortAndLongDescriptions(
             && $tokens[$shortPtr]['line'] + 1 === $tokens[$shortPtrEnd]['line']
             && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
         ) {
-            $error = 'There must be exactly one blank line between lines';
+            $error = 'There must be exactly one blank line between lines short and long descriptions';
             $phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
         }
         if ($shortPtrEnd != $shortPtr) {

diff --git a/...tsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt b/...tsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt
@@ -3,10 +3,10 @@ FILE: ...tation/_fixtures/ClassAnnotationNoSpacingBetweenLinesFixture.php\n
 ----------------------------------------------------------------------\n
 FOUND 1 ERROR AFFECTING 1 LINE\n
 ----------------------------------------------------------------------\n
- 13 | ERROR | [x] There must be exactly one blank line between lines\n
+ 13 | ERROR | [x] There must be exactly one blank line between lines short and long descriptions\n
 ----------------------------------------------------------------------\n
 PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
 ----------------------------------------------------------------------\n
 \n
 \n
-'
+'
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
@@ -67,8 +67,8 @@ protected function assertWritable($path)
      */
     protected function assertIsFile($path)
     {
-        clearstatcache();
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+        clearstatcache(true, $absolutePath);
         if (!$this->driver->isFile($absolutePath)) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase('The "%1" file doesn\'t exist.', [$absolutePath])