No more php7 directory

slevomat · Apr 22, 2016 · c3bbd67 · c3bbd67
1 parent dd3906f
commit c3bbd67
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/tests/Helpers/FunctionHelperTest.php b/tests/Helpers/FunctionHelperTest.php
@@ -25,7 +25,7 @@ public function testNameWithoutNamespace()
 
 	public function testNameInAnonymousClass()
 	{
-		$codeSnifferFile = $this->getCodeSnifferFile(__DIR__ . '/data/php7/functionInAnonymousClass.php');
+		$codeSnifferFile = $this->getCodeSnifferFile(__DIR__ . '/data/functionInAnonymousClass.php');
 		$this->assertSame('class@anonymous::fooMethod', FunctionHelper::getFullyQualifiedName($codeSnifferFile, $this->findFunctionPointerByName($codeSnifferFile, 'fooMethod')));
 		$this->assertSame('fooMethod', FunctionHelper::getName($codeSnifferFile, $this->findFunctionPointerByName($codeSnifferFile, 'fooMethod')));
 	}
@@ -47,7 +47,7 @@ public function testFunctionOrMethod()
 
 	public function testParametersTypeHints()
 	{
-		$codeSnifferFile = $this->getCodeSnifferFile(__DIR__ . '/data/php7/functionParametersTypeHints.php');
+		$codeSnifferFile = $this->getCodeSnifferFile(__DIR__ . '/data/functionParametersTypeHints.php');
 
 		$functionPointer = $this->findFunctionPointerByName($codeSnifferFile, 'allParametersWithTypeHints');
 		$parametersTypeHints = FunctionHelper::getParametersTypeHints($codeSnifferFile, $functionPointer);
@@ -123,7 +123,7 @@ public function testReturnsValueOrNot()
 
 	public function testReturnTypeHint()
 	{
-		$codeSnifferFile = $this->getCodeSnifferFile(__DIR__ . '/data/php7/functionReturnTypeHint.php');
+		$codeSnifferFile = $this->getCodeSnifferFile(__DIR__ . '/data/functionReturnTypeHint.php');
 
 		$functionPointer = $this->findFunctionPointerByName($codeSnifferFile, 'withReturnTypeHint');
 		$this->assertTrue(FunctionHelper::hasReturnTypeHint($codeSnifferFile, $functionPointer));

diff --git a/tests/Helpers/ReferencedNameHelperTest.php b/tests/Helpers/ReferencedNameHelperTest.php
@@ -87,7 +87,7 @@ public function testFindReferencedNameEndPointer()
 	public function testReturnTypehint()
 	{
 		$codeSnifferFile = $this->getCodeSnifferFile(
-			__DIR__ . '/data/php7/return-typehint.php'
+			__DIR__ . '/data/return-typehint.php'
 		);
 		$names = ReferencedNameHelper::getAllReferencedNames($codeSnifferFile, 0);
 		$this->assertCount(2, $names);

diff --git a/...rs/data/php7/functionInAnonymousClass.php → ...Helpers/data/functionInAnonymousClass.php b/...rs/data/php7/functionInAnonymousClass.php → ...Helpers/data/functionInAnonymousClass.php
diff --git a/...data/php7/functionParametersTypeHints.php → ...pers/data/functionParametersTypeHints.php b/...data/php7/functionParametersTypeHints.php → ...pers/data/functionParametersTypeHints.php
diff --git a/...pers/data/php7/functionReturnTypeHint.php → ...s/Helpers/data/functionReturnTypeHint.php b/...pers/data/php7/functionReturnTypeHint.php → ...s/Helpers/data/functionReturnTypeHint.php
diff --git a/tests/Helpers/data/php7/return-typehint.php → tests/Helpers/data/return-typehint.php b/tests/Helpers/data/php7/return-typehint.php → tests/Helpers/data/return-typehint.php