From af25ab6fa293827c78d032854e22064330e8dcb9 Mon Sep 17 00:00:00 2001 From: Philipp Scheit Date: Mon, 17 Jun 2013 05:57:56 +0200 Subject: [PATCH 1/3] fix geTclasses to getClasses --- .../Adapters/TokenReflection/StaticCodeAnalysis.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php b/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php index c3521e0..950cb51 100644 --- a/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php +++ b/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php @@ -38,7 +38,7 @@ public function isMethodStatic(File $file, LineRange $range) $lastLine = $range->getEnd(); foreach ($file->getNamespaces() as $namespace) { - foreach ($namespace->geTclasses() as $class) { + foreach ($namespace->getClasses() as $class) { foreach ($class->getMethods() as $method) { if ($method->getStartLine() < $lastLine && $lastLine < $method->getEndLine()) { return $method->isStatic(); @@ -57,7 +57,7 @@ public function getMethodEndLine(File $file, LineRange $range) $lastLine = $range->getEnd(); foreach ($file->getNamespaces() as $namespace) { - foreach ($namespace->geTclasses() as $class) { + foreach ($namespace->getClasses() as $class) { foreach ($class->getMethods() as $method) { if ($method->getStartLine() < $lastLine && $lastLine < $method->getEndLine()) { return $method->getEndLine(); @@ -76,7 +76,7 @@ public function getMethodStartLine(File $file, LineRange $range) $lastLine = $range->getEnd(); foreach ($file->getNamespaces() as $namespace) { - foreach ($namespace->geTclasses() as $class) { + foreach ($namespace->getClasses() as $class) { foreach ($class->getMethods() as $method) { if ($method->getStartLine() < $lastLine && $lastLine < $method->getEndLine()) { return $method->getStartLine(); From 8b3510c228bc0bdea06a36b89aa663df76c130c6 Mon Sep 17 00:00:00 2001 From: Philipp Scheit Date: Mon, 17 Jun 2013 06:18:13 +0200 Subject: [PATCH 2/3] fix PhpClassName::getNamespace() on Windows --- src/main/QafooLabs/Refactoring/Domain/Model/PhpClassName.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/QafooLabs/Refactoring/Domain/Model/PhpClassName.php b/src/main/QafooLabs/Refactoring/Domain/Model/PhpClassName.php index 8bf3db2..3806ea0 100644 --- a/src/main/QafooLabs/Refactoring/Domain/Model/PhpClassName.php +++ b/src/main/QafooLabs/Refactoring/Domain/Model/PhpClassName.php @@ -3,7 +3,7 @@ namespace QafooLabs\Refactoring\Domain\Model; /** - * Abstraction fo php class names based on a file. + * Abstraction for php class names based on a file. */ class PhpClassName { @@ -16,7 +16,7 @@ public function __construct(File $file) public function getNamespace() { - $parts = explode("/", $this->file->getRelativePath()); + $parts = explode(DIRECTORY_SEPARATOR, ltrim($this->file->getRelativePath(), DIRECTORY_SEPARATOR)); $namespace = array(); foreach ($parts as $part) { From ee07ebd0c89f55acbaa49147de4e142502cd99f0 Mon Sep 17 00:00:00 2001 From: Philipp Scheit Date: Mon, 17 Jun 2013 06:18:33 +0200 Subject: [PATCH 3/3] PhpClassNameTest: add assertion for getName() --- src/test/QafooLabs/Refactoring/Domain/Model/PhpClassNameTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/QafooLabs/Refactoring/Domain/Model/PhpClassNameTest.php b/src/test/QafooLabs/Refactoring/Domain/Model/PhpClassNameTest.php index 14ebb5d..3c82255 100644 --- a/src/test/QafooLabs/Refactoring/Domain/Model/PhpClassNameTest.php +++ b/src/test/QafooLabs/Refactoring/Domain/Model/PhpClassNameTest.php @@ -10,5 +10,6 @@ public function testNames() $this->assertEquals("PhpClassNameTest", $className->getShortname()); $this->assertEquals("QafooLabs\Refactoring\Domain\Model", $className->getNamespace()); + $this->assertEquals("QafooLabs\Refactoring\Domain\Model\PhpClassNameTest", $className->getName()); } }