From 827f052feb9e80153584d20f71ec08973e3d0968 Mon Sep 17 00:00:00 2001 From: Danny Verkade Date: Wed, 30 Aug 2017 22:27:17 +0200 Subject: [PATCH] - Fixed spelling mistake, changed function isClassLoadableFromDisc to isClassLoadabkelFromDisk - Fowarded old function to the new function so that it's fully backward compatible. - Deprecated old function with spelling mistake --- .../Magento/Framework/Code/Generator.php | 2 +- .../Framework/Code/Generator/DefinedClasses.php | 16 ++++++++++++++-- .../Test/Unit/Generator/EntityAbstractTest.php | 2 +- .../Framework/Code/Test/Unit/GeneratorTest.php | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php index 0b807775e032..a845712b4659 100644 --- a/lib/internal/Magento/Framework/Code/Generator.php +++ b/lib/internal/Magento/Framework/Code/Generator.php @@ -199,7 +199,7 @@ protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $re { if (!$resultEntityType || !$sourceClassName) { return self::GENERATION_ERROR; - } elseif ($this->definedClasses->isClassLoadableFromDisc($resultClass)) { + } elseif ($this->definedClasses->isClassLoadableFromDisk($resultClass)) { $generatedFileName = $this->_ioObject->generateResultFileName($resultClass); /** * Must handle two edge cases: a competing process has generated the class and written it to disc already, diff --git a/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php b/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php index 91d6e001a4ed..363c6f59b17e 100644 --- a/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php +++ b/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php @@ -21,7 +21,7 @@ class DefinedClasses */ public function isClassLoadable($className) { - return $this->isClassLoadableFromMemory($className) || $this->isClassLoadableFromDisc($className); + return $this->isClassLoadableFromMemory($className) || $this->isClassLoadableFromDisk($className); } /** @@ -36,12 +36,24 @@ public function isClassLoadableFromMemory($className) } /** - * Determine if a class exists on disc + * Determine if a class exists on disk * * @param string $className * @return bool + * @deprecated */ public function isClassLoadableFromDisc($className) + { + return $this->isClassLoadableFromDisk($className); + } + + /** + * Determine if a class exists on disk + * + * @param string $className + * @return bool + */ + public function isClassLoadableFromDisk($className) { try { return (bool)AutoloaderRegistry::getAutoloader()->findFile($className); diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php index f4691b90e80d..afd784b061a2 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php @@ -233,7 +233,7 @@ protected function _prepareMocksForValidateData( ->willReturn($sourceClassExists); if ($resultClassExists) { $definedClassesMock->expects($this->once()) - ->method('isClassLoadableFromDisc') + ->method('isClassLoadableFromDisk') ->with($this->resultClass) ->willReturn($resultClassExists); } diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php index 3052f682d82c..dfb547ae3d53 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php @@ -114,7 +114,7 @@ public function testGenerateClassWithError() public function testGenerateClassWithExistName($fileExists) { $this->definedClassesMock->expects($this->any()) - ->method('isClassLoadableFromDisc') + ->method('isClassLoadableFromDisk') ->willReturn(true); $resultClassFileName = '/Magento/Path/To/Class.php';