Skip to content
This repository was archived by the owner on Jul 12, 2020. It is now read-only.

Commit 64756f2

Browse files
committed
Merge pull request #20 from pscheit/master
Typo Fix in StaticCodeAnalysis, fix PhpClassName on Windows
2 parents 0a48b2a + ee07ebd commit 64756f2

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function isMethodStatic(File $file, LineRange $range)
3838
$lastLine = $range->getEnd();
3939

4040
foreach ($file->getNamespaces() as $namespace) {
41-
foreach ($namespace->geTclasses() as $class) {
41+
foreach ($namespace->getClasses() as $class) {
4242
foreach ($class->getMethods() as $method) {
4343
if ($method->getStartLine() < $lastLine && $lastLine < $method->getEndLine()) {
4444
return $method->isStatic();
@@ -57,7 +57,7 @@ public function getMethodEndLine(File $file, LineRange $range)
5757
$lastLine = $range->getEnd();
5858

5959
foreach ($file->getNamespaces() as $namespace) {
60-
foreach ($namespace->geTclasses() as $class) {
60+
foreach ($namespace->getClasses() as $class) {
6161
foreach ($class->getMethods() as $method) {
6262
if ($method->getStartLine() < $lastLine && $lastLine < $method->getEndLine()) {
6363
return $method->getEndLine();
@@ -76,7 +76,7 @@ public function getMethodStartLine(File $file, LineRange $range)
7676
$lastLine = $range->getEnd();
7777

7878
foreach ($file->getNamespaces() as $namespace) {
79-
foreach ($namespace->geTclasses() as $class) {
79+
foreach ($namespace->getClasses() as $class) {
8080
foreach ($class->getMethods() as $method) {
8181
if ($method->getStartLine() < $lastLine && $lastLine < $method->getEndLine()) {
8282
return $method->getStartLine();

src/main/QafooLabs/Refactoring/Domain/Model/PhpClassName.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace QafooLabs\Refactoring\Domain\Model;
44

55
/**
6-
* Abstraction fo php class names based on a file.
6+
* Abstraction for php class names based on a file.
77
*/
88
class PhpClassName
99
{
@@ -16,7 +16,7 @@ public function __construct(File $file)
1616

1717
public function getNamespace()
1818
{
19-
$parts = explode("/", $this->file->getRelativePath());
19+
$parts = explode(DIRECTORY_SEPARATOR, ltrim($this->file->getRelativePath(), DIRECTORY_SEPARATOR));
2020
$namespace = array();
2121

2222
foreach ($parts as $part) {

src/test/QafooLabs/Refactoring/Domain/Model/PhpClassNameTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ public function testNames()
1010

1111
$this->assertEquals("PhpClassNameTest", $className->getShortname());
1212
$this->assertEquals("QafooLabs\Refactoring\Domain\Model", $className->getNamespace());
13+
$this->assertEquals("QafooLabs\Refactoring\Domain\Model\PhpClassNameTest", $className->getName());
1314
}
1415
}

0 commit comments

Comments
 (0)