Skip to content

Commit fe15e3e

Browse files
author
Oleksii Korshenko
authored
MAGETWO-72147: Fix spelling mistake in the code generator #10718
2 parents b9d696e + 18bd50d commit fe15e3e

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

lib/internal/Magento/Framework/Code/Generator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $re
199199
{
200200
if (!$resultEntityType || !$sourceClassName) {
201201
return self::GENERATION_ERROR;
202-
} elseif ($this->definedClasses->isClassLoadableFromDisc($resultClass)) {
202+
} elseif ($this->definedClasses->isClassLoadableFromDisk($resultClass)) {
203203
$generatedFileName = $this->_ioObject->generateResultFileName($resultClass);
204204
/**
205205
* Must handle two edge cases: a competing process has generated the class and written it to disc already,

lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class DefinedClasses
2121
*/
2222
public function isClassLoadable($className)
2323
{
24-
return $this->isClassLoadableFromMemory($className) || $this->isClassLoadableFromDisc($className);
24+
return $this->isClassLoadableFromMemory($className) || $this->isClassLoadableFromDisk($className);
2525
}
2626

2727
/**
@@ -36,12 +36,24 @@ public function isClassLoadableFromMemory($className)
3636
}
3737

3838
/**
39-
* Determine if a class exists on disc
39+
* Determine if a class exists on disk
4040
*
4141
* @param string $className
4242
* @return bool
43+
* @deprecated
4344
*/
4445
public function isClassLoadableFromDisc($className)
46+
{
47+
return $this->isClassLoadableFromDisk($className);
48+
}
49+
50+
/**
51+
* Determine if a class exists on disk
52+
*
53+
* @param string $className
54+
* @return bool
55+
*/
56+
public function isClassLoadableFromDisk($className)
4557
{
4658
try {
4759
return (bool)AutoloaderRegistry::getAutoloader()->findFile($className);

lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ protected function _prepareMocksForValidateData(
233233
->willReturn($sourceClassExists);
234234
if ($resultClassExists) {
235235
$definedClassesMock->expects($this->once())
236-
->method('isClassLoadableFromDisc')
236+
->method('isClassLoadableFromDisk')
237237
->with($this->resultClass)
238238
->willReturn($resultClassExists);
239239
}

lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function testGenerateClassWithError()
114114
public function testGenerateClassWithExistName($fileExists)
115115
{
116116
$this->definedClassesMock->expects($this->any())
117-
->method('isClassLoadableFromDisc')
117+
->method('isClassLoadableFromDisk')
118118
->willReturn(true);
119119

120120
$resultClassFileName = '/Magento/Path/To/Class.php';

0 commit comments

Comments
 (0)