Merge pull request #288 from uuf6429/chore/relocate-files

Relocate files to remove redundant directories
Behat · Feb 22, 2025 · 5edc2f5 · 5edc2f5
2 parents 482a58e + d7dc340
commit 5edc2f5
Show file tree

Hide file tree

Showing 156 changed files with 9 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -34,14 +34,14 @@
     },
 
     "autoload": {
-        "psr-0": {
-            "Behat\\Gherkin": "src/"
+        "psr-4": {
+            "Behat\\Gherkin\\": "src/"
         }
     },
 
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests/"
+            "Tests\\Behat\\Gherkin\\": "tests/"
         }
     },
 

diff --git a/phpunit.dist.xml b/phpunit.dist.xml
@@ -20,12 +20,12 @@
          displayDetailsOnTestsThatTriggerWarnings="true">
     <testsuites>
         <testsuite name="Behat Gherkin test suite">
-            <directory>./tests/Behat/Gherkin/</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
     <source>
         <include>
-            <directory>./src/Behat/Gherkin/</directory>
+            <directory>./src/</directory>
         </include>
     </source>
 </phpunit>
diff --git a/src/Behat/Gherkin/Cache/CacheInterface.php → src/Cache/CacheInterface.php b/src/Behat/Gherkin/Cache/CacheInterface.php → src/Cache/CacheInterface.php
diff --git a/src/Behat/Gherkin/Cache/FileCache.php → src/Cache/FileCache.php b/src/Behat/Gherkin/Cache/FileCache.php → src/Cache/FileCache.php
diff --git a/src/Behat/Gherkin/Cache/MemoryCache.php → src/Cache/MemoryCache.php b/src/Behat/Gherkin/Cache/MemoryCache.php → src/Cache/MemoryCache.php
diff --git a/...ehat/Gherkin/Exception/CacheException.php → src/Exception/CacheException.php b/...ehat/Gherkin/Exception/CacheException.php → src/Exception/CacheException.php
diff --git a/src/Behat/Gherkin/Exception/Exception.php → src/Exception/Exception.php b/src/Behat/Gherkin/Exception/Exception.php → src/Exception/Exception.php
diff --git a/...ehat/Gherkin/Exception/LexerException.php → src/Exception/LexerException.php b/...ehat/Gherkin/Exception/LexerException.php → src/Exception/LexerException.php
diff --git a/...Behat/Gherkin/Exception/NodeException.php → src/Exception/NodeException.php b/...Behat/Gherkin/Exception/NodeException.php → src/Exception/NodeException.php
diff --git a/...hat/Gherkin/Exception/ParserException.php → src/Exception/ParserException.php b/...hat/Gherkin/Exception/ParserException.php → src/Exception/ParserException.php
diff --git a/src/Behat/Gherkin/Filter/ComplexFilter.php → src/Filter/ComplexFilter.php b/src/Behat/Gherkin/Filter/ComplexFilter.php → src/Filter/ComplexFilter.php
diff --git a/...Gherkin/Filter/ComplexFilterInterface.php → src/Filter/ComplexFilterInterface.php b/...Gherkin/Filter/ComplexFilterInterface.php → src/Filter/ComplexFilterInterface.php
diff --git a/...Gherkin/Filter/FeatureFilterInterface.php → src/Filter/FeatureFilterInterface.php b/...Gherkin/Filter/FeatureFilterInterface.php → src/Filter/FeatureFilterInterface.php
diff --git a/src/Behat/Gherkin/Filter/FilterInterface.php → src/Filter/FilterInterface.php b/src/Behat/Gherkin/Filter/FilterInterface.php → src/Filter/FilterInterface.php
diff --git a/src/Behat/Gherkin/Filter/LineFilter.php → src/Filter/LineFilter.php b/src/Behat/Gherkin/Filter/LineFilter.php → src/Filter/LineFilter.php
diff --git a/src/Behat/Gherkin/Filter/LineRangeFilter.php → src/Filter/LineRangeFilter.php b/src/Behat/Gherkin/Filter/LineRangeFilter.php → src/Filter/LineRangeFilter.php
diff --git a/src/Behat/Gherkin/Filter/NameFilter.php → src/Filter/NameFilter.php b/src/Behat/Gherkin/Filter/NameFilter.php → src/Filter/NameFilter.php
diff --git a/src/Behat/Gherkin/Filter/NarrativeFilter.php → src/Filter/NarrativeFilter.php b/src/Behat/Gherkin/Filter/NarrativeFilter.php → src/Filter/NarrativeFilter.php
diff --git a/src/Behat/Gherkin/Filter/PathsFilter.php → src/Filter/PathsFilter.php b/src/Behat/Gherkin/Filter/PathsFilter.php → src/Filter/PathsFilter.php
diff --git a/src/Behat/Gherkin/Filter/RoleFilter.php → src/Filter/RoleFilter.php b/src/Behat/Gherkin/Filter/RoleFilter.php → src/Filter/RoleFilter.php
diff --git a/src/Behat/Gherkin/Filter/SimpleFilter.php → src/Filter/SimpleFilter.php b/src/Behat/Gherkin/Filter/SimpleFilter.php → src/Filter/SimpleFilter.php
diff --git a/src/Behat/Gherkin/Filter/TagFilter.php → src/Filter/TagFilter.php b/src/Behat/Gherkin/Filter/TagFilter.php → src/Filter/TagFilter.php
diff --git a/src/Behat/Gherkin/Gherkin.php → src/Gherkin.php b/src/Behat/Gherkin/Gherkin.php → src/Gherkin.php
diff --git a/src/Behat/Gherkin/Keywords/ArrayKeywords.php → src/Keywords/ArrayKeywords.php b/src/Behat/Gherkin/Keywords/ArrayKeywords.php → src/Keywords/ArrayKeywords.php
diff --git a/.../Gherkin/Keywords/CachedArrayKeywords.php → src/Keywords/CachedArrayKeywords.php b/.../Gherkin/Keywords/CachedArrayKeywords.php → src/Keywords/CachedArrayKeywords.php
diff --git a/...hat/Gherkin/Keywords/CucumberKeywords.php → src/Keywords/CucumberKeywords.php b/...hat/Gherkin/Keywords/CucumberKeywords.php → src/Keywords/CucumberKeywords.php
diff --git a/...Behat/Gherkin/Keywords/KeywordsDumper.php → src/Keywords/KeywordsDumper.php b/...Behat/Gherkin/Keywords/KeywordsDumper.php → src/Keywords/KeywordsDumper.php
diff --git a/...at/Gherkin/Keywords/KeywordsInterface.php → src/Keywords/KeywordsInterface.php b/...at/Gherkin/Keywords/KeywordsInterface.php → src/Keywords/KeywordsInterface.php
diff --git a/src/Behat/Gherkin/Lexer.php → src/Lexer.php b/src/Behat/Gherkin/Lexer.php → src/Lexer.php
diff --git a/...hat/Gherkin/Loader/AbstractFileLoader.php → src/Loader/AbstractFileLoader.php b/...hat/Gherkin/Loader/AbstractFileLoader.php → src/Loader/AbstractFileLoader.php
diff --git a/src/Behat/Gherkin/Loader/ArrayLoader.php → src/Loader/ArrayLoader.php b/src/Behat/Gherkin/Loader/ArrayLoader.php → src/Loader/ArrayLoader.php
diff --git a/...herkin/Loader/CucumberNDJsonAstLoader.php → src/Loader/CucumberNDJsonAstLoader.php b/...herkin/Loader/CucumberNDJsonAstLoader.php → src/Loader/CucumberNDJsonAstLoader.php
diff --git a/src/Behat/Gherkin/Loader/DirectoryLoader.php → src/Loader/DirectoryLoader.php b/src/Behat/Gherkin/Loader/DirectoryLoader.php → src/Loader/DirectoryLoader.php
diff --git a/...at/Gherkin/Loader/FileLoaderInterface.php → src/Loader/FileLoaderInterface.php b/...at/Gherkin/Loader/FileLoaderInterface.php → src/Loader/FileLoaderInterface.php
diff --git a/...ehat/Gherkin/Loader/GherkinFileLoader.php → src/Loader/GherkinFileLoader.php b/...ehat/Gherkin/Loader/GherkinFileLoader.php → src/Loader/GherkinFileLoader.php
diff --git a/src/Behat/Gherkin/Loader/LoaderInterface.php → src/Loader/LoaderInterface.php b/src/Behat/Gherkin/Loader/LoaderInterface.php → src/Loader/LoaderInterface.php
diff --git a/src/Behat/Gherkin/Loader/YamlFileLoader.php → src/Loader/YamlFileLoader.php b/src/Behat/Gherkin/Loader/YamlFileLoader.php → src/Loader/YamlFileLoader.php
diff --git a/src/Behat/Gherkin/Node/ArgumentInterface.php → src/Node/ArgumentInterface.php b/src/Behat/Gherkin/Node/ArgumentInterface.php → src/Node/ArgumentInterface.php
diff --git a/src/Behat/Gherkin/Node/BackgroundNode.php → src/Node/BackgroundNode.php b/src/Behat/Gherkin/Node/BackgroundNode.php → src/Node/BackgroundNode.php
diff --git a/src/Behat/Gherkin/Node/ExampleNode.php → src/Node/ExampleNode.php b/src/Behat/Gherkin/Node/ExampleNode.php → src/Node/ExampleNode.php
diff --git a/src/Behat/Gherkin/Node/ExampleTableNode.php → src/Node/ExampleTableNode.php b/src/Behat/Gherkin/Node/ExampleTableNode.php → src/Node/ExampleTableNode.php
diff --git a/src/Behat/Gherkin/Node/FeatureNode.php → src/Node/FeatureNode.php b/src/Behat/Gherkin/Node/FeatureNode.php → src/Node/FeatureNode.php
diff --git a/...hat/Gherkin/Node/KeywordNodeInterface.php → src/Node/KeywordNodeInterface.php b/...hat/Gherkin/Node/KeywordNodeInterface.php → src/Node/KeywordNodeInterface.php
diff --git a/...t/Gherkin/Node/NamedScenarioInterface.php → src/Node/NamedScenarioInterface.php b/...t/Gherkin/Node/NamedScenarioInterface.php → src/Node/NamedScenarioInterface.php
diff --git a/src/Behat/Gherkin/Node/NodeInterface.php → src/Node/NodeInterface.php b/src/Behat/Gherkin/Node/NodeInterface.php → src/Node/NodeInterface.php
diff --git a/src/Behat/Gherkin/Node/OutlineNode.php → src/Node/OutlineNode.php b/src/Behat/Gherkin/Node/OutlineNode.php → src/Node/OutlineNode.php
diff --git a/src/Behat/Gherkin/Node/PyStringNode.php → src/Node/PyStringNode.php b/src/Behat/Gherkin/Node/PyStringNode.php → src/Node/PyStringNode.php
diff --git a/src/Behat/Gherkin/Node/ScenarioInterface.php → src/Node/ScenarioInterface.php b/src/Behat/Gherkin/Node/ScenarioInterface.php → src/Node/ScenarioInterface.php
diff --git a/...at/Gherkin/Node/ScenarioLikeInterface.php → src/Node/ScenarioLikeInterface.php b/...at/Gherkin/Node/ScenarioLikeInterface.php → src/Node/ScenarioLikeInterface.php
diff --git a/src/Behat/Gherkin/Node/ScenarioNode.php → src/Node/ScenarioNode.php b/src/Behat/Gherkin/Node/ScenarioNode.php → src/Node/ScenarioNode.php
diff --git a/...t/Gherkin/Node/StepContainerInterface.php → src/Node/StepContainerInterface.php b/...t/Gherkin/Node/StepContainerInterface.php → src/Node/StepContainerInterface.php
diff --git a/src/Behat/Gherkin/Node/StepNode.php → src/Node/StepNode.php b/src/Behat/Gherkin/Node/StepNode.php → src/Node/StepNode.php
diff --git a/src/Behat/Gherkin/Node/TableNode.php → src/Node/TableNode.php b/src/Behat/Gherkin/Node/TableNode.php → src/Node/TableNode.php
diff --git a/...ehat/Gherkin/Node/TaggedNodeInterface.php → src/Node/TaggedNodeInterface.php b/...ehat/Gherkin/Node/TaggedNodeInterface.php → src/Node/TaggedNodeInterface.php
diff --git a/src/Behat/Gherkin/Parser.php → src/Parser.php b/src/Behat/Gherkin/Parser.php → src/Parser.php
diff --git a/tests/Behat/Gherkin/Cache/FileCacheTest.php → tests/Cache/FileCacheTest.php b/tests/Behat/Gherkin/Cache/FileCacheTest.php → tests/Cache/FileCacheTest.php
diff --git a/...s/Behat/Gherkin/Cache/MemoryCacheTest.php → tests/Cache/MemoryCacheTest.php b/...s/Behat/Gherkin/Cache/MemoryCacheTest.php → tests/Cache/MemoryCacheTest.php
diff --git a/...at/Gherkin/Cucumber/CompatibilityTest.php → tests/Cucumber/CompatibilityTest.php b/...at/Gherkin/Cucumber/CompatibilityTest.php → tests/Cucumber/CompatibilityTest.php
@@ -31,7 +31,7 @@
  */
 class CompatibilityTest extends TestCase
 {
-    public const TESTDATA_PATH = __DIR__ . '/../../../../vendor/cucumber/cucumber/gherkin/testdata';
+    public const TESTDATA_PATH = __DIR__ . '/../../vendor/cucumber/cucumber/gherkin/testdata';
 
     private array $notParsingCorrectly = [
         'complex_background.feature' => 'Rule keyword not supported',
@@ -64,7 +64,7 @@ class CompatibilityTest extends TestCase
 
     protected function setUp(): void
     {
-        $arrKeywords = include __DIR__ . '/../../../../i18n.php';
+        $arrKeywords = include __DIR__ . '/../../i18n.php';
         $lexer = new Lexer(new Keywords\ArrayKeywords($arrKeywords));
         $this->parser = new Parser($lexer);
         $this->loader = new CucumberNDJsonAstLoader();

diff --git a/...s/Behat/Gherkin/Filter/FilterTestCase.php → tests/Filter/FilterTestCase.php b/...s/Behat/Gherkin/Filter/FilterTestCase.php → tests/Filter/FilterTestCase.php
diff --git a/.../Behat/Gherkin/Filter/Fixtures/full/file1 → tests/Filter/Fixtures/full/file1 b/.../Behat/Gherkin/Filter/Fixtures/full/file1 → tests/Filter/Fixtures/full/file1
diff --git a/.../Behat/Gherkin/Filter/Fixtures/full/file2 → tests/Filter/Fixtures/full/file2 b/.../Behat/Gherkin/Filter/Fixtures/full/file2 → tests/Filter/Fixtures/full/file2
diff --git a/...t/Gherkin/Filter/Fixtures/full_path/file1 → tests/Filter/Fixtures/full_path/file1 b/...t/Gherkin/Filter/Fixtures/full_path/file1 → tests/Filter/Fixtures/full_path/file1
diff --git a/...s/Behat/Gherkin/Filter/LineFilterTest.php → tests/Filter/LineFilterTest.php b/...s/Behat/Gherkin/Filter/LineFilterTest.php → tests/Filter/LineFilterTest.php
diff --git a/...at/Gherkin/Filter/LineRangeFilterTest.php → tests/Filter/LineRangeFilterTest.php b/...at/Gherkin/Filter/LineRangeFilterTest.php → tests/Filter/LineRangeFilterTest.php
diff --git a/...s/Behat/Gherkin/Filter/NameFilterTest.php → tests/Filter/NameFilterTest.php b/...s/Behat/Gherkin/Filter/NameFilterTest.php → tests/Filter/NameFilterTest.php
diff --git a/...at/Gherkin/Filter/NarrativeFilterTest.php → tests/Filter/NarrativeFilterTest.php b/...at/Gherkin/Filter/NarrativeFilterTest.php → tests/Filter/NarrativeFilterTest.php
diff --git a/.../Behat/Gherkin/Filter/PathsFilterTest.php → tests/Filter/PathsFilterTest.php b/.../Behat/Gherkin/Filter/PathsFilterTest.php → tests/Filter/PathsFilterTest.php
diff --git a/...s/Behat/Gherkin/Filter/RoleFilterTest.php → tests/Filter/RoleFilterTest.php b/...s/Behat/Gherkin/Filter/RoleFilterTest.php → tests/Filter/RoleFilterTest.php
diff --git a/tests/Behat/Gherkin/Filter/TagFilterTest.php → tests/Filter/TagFilterTest.php b/tests/Behat/Gherkin/Filter/TagFilterTest.php → tests/Filter/TagFilterTest.php
diff --git a/...n/Fixtures/directories/phps/some_file.php → ...s/Fixtures/directories/phps/some_file.php b/...n/Fixtures/directories/phps/some_file.php → ...s/Fixtures/directories/phps/some_file.php
diff --git a/...hat/Gherkin/Fixtures/etalons/addition.yml → tests/Fixtures/etalons/addition.yml b/...hat/Gherkin/Fixtures/etalons/addition.yml → tests/Fixtures/etalons/addition.yml
diff --git a/...t/Gherkin/Fixtures/etalons/background.yml → tests/Fixtures/etalons/background.yml b/...t/Gherkin/Fixtures/etalons/background.yml → tests/Fixtures/etalons/background.yml
diff --git a/...kin/Fixtures/etalons/background_title.yml → tests/Fixtures/etalons/background_title.yml b/...kin/Fixtures/etalons/background_title.yml → tests/Fixtures/etalons/background_title.yml
diff --git a/...Gherkin/Fixtures/etalons/big_pystring.yml → tests/Fixtures/etalons/big_pystring.yml b/...Gherkin/Fixtures/etalons/big_pystring.yml → tests/Fixtures/etalons/big_pystring.yml
diff --git a/...t/Gherkin/Fixtures/etalons/clean_tags.yml → tests/Fixtures/etalons/clean_tags.yml b/...t/Gherkin/Fixtures/etalons/clean_tags.yml → tests/Fixtures/etalons/clean_tags.yml
diff --git a/...herkin/Fixtures/etalons/commented_out.yml → tests/Fixtures/etalons/commented_out.yml b/...herkin/Fixtures/etalons/commented_out.yml → tests/Fixtures/etalons/commented_out.yml
diff --git a/...hat/Gherkin/Fixtures/etalons/comments.yml → tests/Fixtures/etalons/comments.yml b/...hat/Gherkin/Fixtures/etalons/comments.yml → tests/Fixtures/etalons/comments.yml
diff --git a/...Fixtures/etalons/complex_descriptions.yml → ...Fixtures/etalons/complex_descriptions.yml b/...Fixtures/etalons/complex_descriptions.yml → ...Fixtures/etalons/complex_descriptions.yml
diff --git a/.../Behat/Gherkin/Fixtures/etalons/empty.yml → tests/Fixtures/etalons/empty.yml b/.../Behat/Gherkin/Fixtures/etalons/empty.yml → tests/Fixtures/etalons/empty.yml
diff --git a/...erkin/Fixtures/etalons/empty_scenario.yml → tests/Fixtures/etalons/empty_scenario.yml b/...erkin/Fixtures/etalons/empty_scenario.yml → tests/Fixtures/etalons/empty_scenario.yml
diff --git a/...alons/empty_scenario_without_linefeed.yml → ...alons/empty_scenario_without_linefeed.yml b/...alons/empty_scenario_without_linefeed.yml → ...alons/empty_scenario_without_linefeed.yml
diff --git a/...rkin/Fixtures/etalons/empty_scenarios.yml → tests/Fixtures/etalons/empty_scenarios.yml b/...rkin/Fixtures/etalons/empty_scenarios.yml → tests/Fixtures/etalons/empty_scenarios.yml
diff --git a/...at/Gherkin/Fixtures/etalons/fibonacci.yml → tests/Fixtures/etalons/fibonacci.yml b/...at/Gherkin/Fixtures/etalons/fibonacci.yml → tests/Fixtures/etalons/fibonacci.yml
diff --git a/...kin/Fixtures/etalons/hashes_in_quotes.yml → tests/Fixtures/etalons/hashes_in_quotes.yml b/...kin/Fixtures/etalons/hashes_in_quotes.yml → tests/Fixtures/etalons/hashes_in_quotes.yml
diff --git a/...hat/Gherkin/Fixtures/etalons/issue_13.yml → tests/Fixtures/etalons/issue_13.yml b/...hat/Gherkin/Fixtures/etalons/issue_13.yml → tests/Fixtures/etalons/issue_13.yml
diff --git a/.../Gherkin/Fixtures/etalons/ja_addition.yml → tests/Fixtures/etalons/ja_addition.yml b/.../Gherkin/Fixtures/etalons/ja_addition.yml → tests/Fixtures/etalons/ja_addition.yml
diff --git a/...n/Fixtures/etalons/long_title_feature.yml → ...s/Fixtures/etalons/long_title_feature.yml b/...n/Fixtures/etalons/long_title_feature.yml → ...s/Fixtures/etalons/long_title_feature.yml
diff --git a/...erkin/Fixtures/etalons/multiline_name.yml → tests/Fixtures/etalons/multiline_name.yml b/...erkin/Fixtures/etalons/multiline_name.yml → tests/Fixtures/etalons/multiline_name.yml
diff --git a/.../etalons/multiline_name_with_newlines.yml → .../etalons/multiline_name_with_newlines.yml b/.../etalons/multiline_name_with_newlines.yml → .../etalons/multiline_name_with_newlines.yml
diff --git a/...in/Fixtures/etalons/multiplepystrings.yml → tests/Fixtures/etalons/multiplepystrings.yml b/...in/Fixtures/etalons/multiplepystrings.yml → tests/Fixtures/etalons/multiplepystrings.yml
diff --git a/...talons/outline_with_multiple_examples.yml → ...talons/outline_with_multiple_examples.yml b/...talons/outline_with_multiple_examples.yml → ...talons/outline_with_multiple_examples.yml
diff --git a/.../Fixtures/etalons/outline_with_spaces.yml → .../Fixtures/etalons/outline_with_spaces.yml b/.../Fixtures/etalons/outline_with_spaces.yml → .../Fixtures/etalons/outline_with_spaces.yml
diff --git a/...tures/etalons/outline_with_step_table.yml → ...tures/etalons/outline_with_step_table.yml b/...tures/etalons/outline_with_step_table.yml → ...tures/etalons/outline_with_step_table.yml
diff --git a/...hat/Gherkin/Fixtures/etalons/pystring.yml → tests/Fixtures/etalons/pystring.yml b/...hat/Gherkin/Fixtures/etalons/pystring.yml → tests/Fixtures/etalons/pystring.yml
diff --git a/.../Gherkin/Fixtures/etalons/ru_addition.yml → tests/Fixtures/etalons/ru_addition.yml b/.../Gherkin/Fixtures/etalons/ru_addition.yml → tests/Fixtures/etalons/ru_addition.yml
diff --git a/...Gherkin/Fixtures/etalons/ru_commented.yml → tests/Fixtures/etalons/ru_commented.yml b/...Gherkin/Fixtures/etalons/ru_commented.yml → tests/Fixtures/etalons/ru_commented.yml
diff --git a/...s/etalons/ru_consecutive_calculations.yml → ...s/etalons/ru_consecutive_calculations.yml b/...s/etalons/ru_consecutive_calculations.yml → ...s/etalons/ru_consecutive_calculations.yml
diff --git a/.../Gherkin/Fixtures/etalons/ru_division.yml → tests/Fixtures/etalons/ru_division.yml b/.../Gherkin/Fixtures/etalons/ru_division.yml → tests/Fixtures/etalons/ru_division.yml
diff --git a/...erkin/Fixtures/etalons/start_comments.yml → tests/Fixtures/etalons/start_comments.yml b/...erkin/Fixtures/etalons/start_comments.yml → tests/Fixtures/etalons/start_comments.yml
diff --git a/...Behat/Gherkin/Fixtures/etalons/tables.yml → tests/Fixtures/etalons/tables.yml b/...Behat/Gherkin/Fixtures/etalons/tables.yml → tests/Fixtures/etalons/tables.yml
diff --git a/.../Gherkin/Fixtures/etalons/tags_sample.yml → tests/Fixtures/etalons/tags_sample.yml b/.../Gherkin/Fixtures/etalons/tags_sample.yml → tests/Fixtures/etalons/tags_sample.yml
diff --git a/...at/Gherkin/Fixtures/etalons/test_unit.yml → tests/Fixtures/etalons/test_unit.yml b/...at/Gherkin/Fixtures/etalons/test_unit.yml → tests/Fixtures/etalons/test_unit.yml
diff --git a/...Gherkin/Fixtures/etalons/trimpystring.yml → tests/Fixtures/etalons/trimpystring.yml b/...Gherkin/Fixtures/etalons/trimpystring.yml → tests/Fixtures/etalons/trimpystring.yml
diff --git a/...ures/etalons/undefined_multiline_args.yml → ...ures/etalons/undefined_multiline_args.yml b/...ures/etalons/undefined_multiline_args.yml → ...ures/etalons/undefined_multiline_args.yml
diff --git a/...herkin/Fixtures/features/addition.feature → tests/Fixtures/features/addition.feature b/...herkin/Fixtures/features/addition.feature → tests/Fixtures/features/addition.feature
diff --git a/...rkin/Fixtures/features/background.feature → tests/Fixtures/features/background.feature b/...rkin/Fixtures/features/background.feature → tests/Fixtures/features/background.feature
diff --git a/...ixtures/features/background_title.feature → ...ixtures/features/background_title.feature b/...ixtures/features/background_title.feature → ...ixtures/features/background_title.feature
diff --git a/...in/Fixtures/features/big_pystring.feature → tests/Fixtures/features/big_pystring.feature b/...in/Fixtures/features/big_pystring.feature → tests/Fixtures/features/big_pystring.feature
diff --git a/...rkin/Fixtures/features/clean_tags.feature → tests/Fixtures/features/clean_tags.feature b/...rkin/Fixtures/features/clean_tags.feature → tests/Fixtures/features/clean_tags.feature
diff --git a/...n/Fixtures/features/commented_out.feature → ...s/Fixtures/features/commented_out.feature b/...n/Fixtures/features/commented_out.feature → ...s/Fixtures/features/commented_out.feature
diff --git a/...herkin/Fixtures/features/comments.feature → tests/Fixtures/features/comments.feature b/...herkin/Fixtures/features/comments.feature → tests/Fixtures/features/comments.feature
diff --git a/...res/features/complex_descriptions.feature → ...res/features/complex_descriptions.feature b/...res/features/complex_descriptions.feature → ...res/features/complex_descriptions.feature
diff --git a/...t/Gherkin/Fixtures/features/empty.feature → tests/Fixtures/features/empty.feature b/...t/Gherkin/Fixtures/features/empty.feature → tests/Fixtures/features/empty.feature
diff --git a/.../Fixtures/features/empty_scenario.feature → .../Fixtures/features/empty_scenario.feature b/.../Fixtures/features/empty_scenario.feature → .../Fixtures/features/empty_scenario.feature
diff --git a/...s/empty_scenario_without_linefeed.feature → ...s/empty_scenario_without_linefeed.feature b/...s/empty_scenario_without_linefeed.feature → ...s/empty_scenario_without_linefeed.feature
diff --git a/...Fixtures/features/empty_scenarios.feature → ...Fixtures/features/empty_scenarios.feature b/...Fixtures/features/empty_scenarios.feature → ...Fixtures/features/empty_scenarios.feature
diff --git a/...erkin/Fixtures/features/fibonacci.feature → tests/Fixtures/features/fibonacci.feature b/...erkin/Fixtures/features/fibonacci.feature → tests/Fixtures/features/fibonacci.feature
diff --git a/...ixtures/features/hashes_in_quotes.feature → ...ixtures/features/hashes_in_quotes.feature b/...ixtures/features/hashes_in_quotes.feature → ...ixtures/features/hashes_in_quotes.feature
diff --git a/...herkin/Fixtures/features/issue_13.feature → tests/Fixtures/features/issue_13.feature b/...herkin/Fixtures/features/issue_13.feature → tests/Fixtures/features/issue_13.feature
diff --git a/...kin/Fixtures/features/ja_addition.feature → tests/Fixtures/features/ja_addition.feature b/...kin/Fixtures/features/ja_addition.feature → tests/Fixtures/features/ja_addition.feature
diff --git a/...tures/features/long_title_feature.feature → ...tures/features/long_title_feature.feature b/...tures/features/long_title_feature.feature → ...tures/features/long_title_feature.feature
diff --git a/.../Fixtures/features/multiline_name.feature → .../Fixtures/features/multiline_name.feature b/.../Fixtures/features/multiline_name.feature → .../Fixtures/features/multiline_name.feature
diff --git a/...ures/multiline_name_with_newlines.feature → ...ures/multiline_name_with_newlines.feature b/...ures/multiline_name_with_newlines.feature → ...ures/multiline_name_with_newlines.feature
diff --git a/...xtures/features/multiplepystrings.feature → ...xtures/features/multiplepystrings.feature b/...xtures/features/multiplepystrings.feature → ...xtures/features/multiplepystrings.feature
diff --git a/...es/outline_with_multiple_examples.feature → ...es/outline_with_multiple_examples.feature b/...es/outline_with_multiple_examples.feature → ...es/outline_with_multiple_examples.feature
diff --git a/...ures/features/outline_with_spaces.feature → ...ures/features/outline_with_spaces.feature b/...ures/features/outline_with_spaces.feature → ...ures/features/outline_with_spaces.feature
diff --git a/.../features/outline_with_step_table.feature → .../features/outline_with_step_table.feature b/.../features/outline_with_step_table.feature → .../features/outline_with_step_table.feature
diff --git a/...herkin/Fixtures/features/pystring.feature → tests/Fixtures/features/pystring.feature b/...herkin/Fixtures/features/pystring.feature → tests/Fixtures/features/pystring.feature
diff --git a/...kin/Fixtures/features/ru_addition.feature → tests/Fixtures/features/ru_addition.feature b/...kin/Fixtures/features/ru_addition.feature → tests/Fixtures/features/ru_addition.feature
diff --git a/...in/Fixtures/features/ru_commented.feature → tests/Fixtures/features/ru_commented.feature b/...in/Fixtures/features/ru_commented.feature → tests/Fixtures/features/ru_commented.feature
diff --git a/...tures/ru_consecutive_calculations.feature → ...tures/ru_consecutive_calculations.feature b/...tures/ru_consecutive_calculations.feature → ...tures/ru_consecutive_calculations.feature
diff --git a/...kin/Fixtures/features/ru_division.feature → tests/Fixtures/features/ru_division.feature b/...kin/Fixtures/features/ru_division.feature → tests/Fixtures/features/ru_division.feature
diff --git a/.../Fixtures/features/start_comments.feature → .../Fixtures/features/start_comments.feature b/.../Fixtures/features/start_comments.feature → .../Fixtures/features/start_comments.feature
diff --git a/.../Gherkin/Fixtures/features/tables.feature → tests/Fixtures/features/tables.feature b/.../Gherkin/Fixtures/features/tables.feature → tests/Fixtures/features/tables.feature
diff --git a/...kin/Fixtures/features/tags_sample.feature → tests/Fixtures/features/tags_sample.feature b/...kin/Fixtures/features/tags_sample.feature → tests/Fixtures/features/tags_sample.feature
diff --git a/...erkin/Fixtures/features/test_unit.feature → tests/Fixtures/features/test_unit.feature b/...erkin/Fixtures/features/test_unit.feature → tests/Fixtures/features/test_unit.feature
diff --git a/...in/Fixtures/features/trimpystring.feature → tests/Fixtures/features/trimpystring.feature b/...in/Fixtures/features/trimpystring.feature → tests/Fixtures/features/trimpystring.feature
diff --git a/...features/undefined_multiline_args.feature → ...features/undefined_multiline_args.feature b/...features/undefined_multiline_args.feature → ...features/undefined_multiline_args.feature
diff --git a/tests/Behat/Gherkin/Fixtures/i18n.yml → tests/Fixtures/i18n.yml b/tests/Behat/Gherkin/Fixtures/i18n.yml → tests/Fixtures/i18n.yml
diff --git a/tests/Behat/Gherkin/GherkinTest.php → tests/GherkinTest.php b/tests/Behat/Gherkin/GherkinTest.php → tests/GherkinTest.php
diff --git a/...at/Gherkin/Keywords/ArrayKeywordsTest.php → tests/Keywords/ArrayKeywordsTest.php b/...at/Gherkin/Keywords/ArrayKeywordsTest.php → tests/Keywords/ArrayKeywordsTest.php
diff --git a/...rkin/Keywords/CachedArrayKeywordsTest.php → tests/Keywords/CachedArrayKeywordsTest.php b/...rkin/Keywords/CachedArrayKeywordsTest.php → tests/Keywords/CachedArrayKeywordsTest.php
@@ -17,12 +17,12 @@ class CachedArrayKeywordsTest extends KeywordsTestCase
 {
     protected function getKeywords()
     {
-        return new CachedArrayKeywords(__DIR__ . '/../../../../i18n.php');
+        return new CachedArrayKeywords(__DIR__ . '/../../i18n.php');
     }
 
     protected function getKeywordsArray()
     {
-        return include __DIR__ . '/../../../../i18n.php';
+        return include __DIR__ . '/../../i18n.php';
     }
 
     protected function getSteps($keywords, $text, &$line, $keywordType)

diff --git a/...Gherkin/Keywords/CucumberKeywordsTest.php → tests/Keywords/CucumberKeywordsTest.php b/...Gherkin/Keywords/CucumberKeywordsTest.php → tests/Keywords/CucumberKeywordsTest.php
diff --git a/...t/Gherkin/Keywords/KeywordsDumperTest.php → tests/Keywords/KeywordsDumperTest.php b/...t/Gherkin/Keywords/KeywordsDumperTest.php → tests/Keywords/KeywordsDumperTest.php
diff --git a/...hat/Gherkin/Keywords/KeywordsTestCase.php → tests/Keywords/KeywordsTestCase.php b/...hat/Gherkin/Keywords/KeywordsTestCase.php → tests/Keywords/KeywordsTestCase.php
diff --git a/.../Behat/Gherkin/Loader/ArrayLoaderTest.php → tests/Loader/ArrayLoaderTest.php b/.../Behat/Gherkin/Loader/ArrayLoaderTest.php → tests/Loader/ArrayLoaderTest.php
diff --git a/...at/Gherkin/Loader/DirectoryLoaderTest.php → tests/Loader/DirectoryLoaderTest.php b/...at/Gherkin/Loader/DirectoryLoaderTest.php → tests/Loader/DirectoryLoaderTest.php
diff --git a/.../Gherkin/Loader/GherkinFileLoaderTest.php → tests/Loader/GherkinFileLoaderTest.php b/.../Gherkin/Loader/GherkinFileLoaderTest.php → tests/Loader/GherkinFileLoaderTest.php
diff --git a/...hat/Gherkin/Loader/YamlFileLoaderTest.php → tests/Loader/YamlFileLoaderTest.php b/...hat/Gherkin/Loader/YamlFileLoaderTest.php → tests/Loader/YamlFileLoaderTest.php
diff --git a/tests/Behat/Gherkin/Node/ExampleNodeTest.php → tests/Node/ExampleNodeTest.php b/tests/Behat/Gherkin/Node/ExampleNodeTest.php → tests/Node/ExampleNodeTest.php
diff --git a/tests/Behat/Gherkin/Node/OutlineNodeTest.php → tests/Node/OutlineNodeTest.php b/tests/Behat/Gherkin/Node/OutlineNodeTest.php → tests/Node/OutlineNodeTest.php
diff --git a/...s/Behat/Gherkin/Node/PyStringNodeTest.php → tests/Node/PyStringNodeTest.php b/...s/Behat/Gherkin/Node/PyStringNodeTest.php → tests/Node/PyStringNodeTest.php
diff --git a/tests/Behat/Gherkin/Node/StepNodeTest.php → tests/Node/StepNodeTest.php b/tests/Behat/Gherkin/Node/StepNodeTest.php → tests/Node/StepNodeTest.php
diff --git a/tests/Behat/Gherkin/Node/TableNodeTest.php → tests/Node/TableNodeTest.php b/tests/Behat/Gherkin/Node/TableNodeTest.php → tests/Node/TableNodeTest.php
diff --git a/tests/Behat/Gherkin/ParserExceptionsTest.php → tests/ParserExceptionsTest.php b/tests/Behat/Gherkin/ParserExceptionsTest.php → tests/ParserExceptionsTest.php
diff --git a/tests/Behat/Gherkin/ParserTest.php → tests/ParserTest.php b/tests/Behat/Gherkin/ParserTest.php → tests/ParserTest.php