Skip to content

Commit 4c6673c

Browse files
authored
ENGCOM-6982: Move cache cleanup operation on state modification operation #26916
2 parents 2d46d98 + 5d8669f commit 4c6673c

File tree

6 files changed

+1074
-56
lines changed

6 files changed

+1074
-56
lines changed

dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private function validateSpacingBetweenShortAndLongDescriptions(
9494
&& $tokens[$shortPtr]['line'] + 1 === $tokens[$shortPtrEnd]['line']
9595
&& $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
9696
) {
97-
$error = 'There must be exactly one blank line between lines';
97+
$error = 'There must be exactly one blank line between lines short and long descriptions';
9898
$phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
9999
}
100100
if ($shortPtrEnd != $shortPtr) {

dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ FILE: ...tation/_fixtures/ClassAnnotationNoSpacingBetweenLinesFixture.php\n
33
----------------------------------------------------------------------\n
44
FOUND 1 ERROR AFFECTING 1 LINE\n
55
----------------------------------------------------------------------\n
6-
13 | ERROR | [x] There must be exactly one blank line between lines\n
6+
13 | ERROR | [x] There must be exactly one blank line between lines short and long descriptions\n
77
----------------------------------------------------------------------\n
88
PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
99
----------------------------------------------------------------------\n
1010
\n
1111
\n
12-
'
12+
'

lib/internal/Magento/Framework/Filesystem/Directory/Write.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ protected function assertWritable($path)
6767
*/
6868
protected function assertIsFile($path)
6969
{
70-
clearstatcache();
7170
$absolutePath = $this->driver->getAbsolutePath($this->path, $path);
71+
clearstatcache(true, $absolutePath);
7272
if (!$this->driver->isFile($absolutePath)) {
7373
throw new FileSystemException(
7474
new \Magento\Framework\Phrase('The "%1" file doesn\'t exist.', [$absolutePath])

0 commit comments

Comments
 (0)