🚑️ Fix phinx config path (#2)

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
   test:
     strategy:
       matrix:
-        PHP: [56, 73, 74, 80]
+        PHP: [56, 73, 74, 80, 81]
     runs-on: ubuntu-latest
 
     steps:

.php-cs-fixer.php

@@ -33,7 +33,7 @@
 	'.vscode',
 	'.github',
 	'.devcontainer',
-	'tests/_support/_generated/',
+	'tests/Support/_generated/',
 ];
 
 $finder = PhpCsFixer\Finder::create()

codeception.yml

@@ -1,8 +1,10 @@
+namespace: Tests
+
 paths:
     tests: tests
     output: tests/_output
-    data: tests/_data
-    support: tests/_support
+    data: tests/Support/Data
+    support: tests/Support
     envs: tests/_envs
 actor_suffix: Tester
 extensions:

composer.json

@@ -14,7 +14,7 @@
         "codeception/codeception": "^4.0 || ^5.0",
         "codeception/module-phpbrowser": "^1.0 || ^2.0",
         "codeception/module-asserts": "^1.3 || ^2.0",
-        "codeception/module-db": "^1.1 || ^2.0"
+        "codeception/module-db": "^1.1 || ^2.0 || ^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -23,7 +23,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Like\\Codeception\\Tests\\": "tests/"
+            "Tests\\": ["tests/", "tests/Support/"]
         }
     },
     "authors": [
@@ -36,7 +36,10 @@
     "scripts": {
         "fix": "php-cs-fixer fix --show-progress=dots",
         "fix:ci": "php-cs-fixer fix --dry-run --stop-on-violation --show-progress=dots",
-        "test": "codecept run",
+        "test": [
+            "codecept build",
+            "codecept run"
+        ],
         "analyse": "phpstan analyse"
     }
 }

phpstan.neon

@@ -4,7 +4,7 @@ parameters:
 		- src
 		- tests
 	scanDirectories:
-		- tests/_support/_generated/
+		- tests/Support/_generated/
 	excludePaths:
 		analyse:
-			- tests/_support/_generated/
+			- tests/Support/_generated/

src/Phinx.php

@@ -18,7 +18,7 @@ public function _before(TestInterface $test) {
 	}
 
 	private function phinx() {
-		$config = realpath(__DIR__ . '/../../phinx.php');
+		$config = $this->findConfigPath();
 
 		$app = new PhinxApplication();
 		$app->setAutoExit(false);
@@ -42,4 +42,26 @@ private function run(PhinxApplication $phinx, BufferedOutput $output, $commandNa
 			trigger_error("Error on phinx execution.\n\n" . $output->fetch(), E_USER_ERROR);
 		}
 	}
+
+	private function findConfigPath() {
+		$paths = [
+			'../../../../tests/phinx.php',
+			'../../../../phinx.php',
+			'../../phinx.php',
+			'../phinx.php', // To use inside library tests
+		];
+
+		$notFound = [];
+
+		foreach ($paths as $path) {
+			$src = __DIR__ . '/' . $path;
+			if (file_exists($src)) {
+				return realpath($src);
+			}
+
+			$notFound[] = $src;
+		}
+
+		trigger_error('Phinx configuration not found. Paths: `' . join('`, `', $notFound) . '`', E_USER_NOTICE);
+	}
 }

tests/acceptance.suite.yml → tests/Acceptance.suite.yml

@@ -9,5 +9,4 @@ modules:
     enabled:
         - PhpBrowser:
             url: http://localhost/myapp
-        - \Helper\Acceptance
-step_decorators: ~        
+step_decorators: ~

tests/functional.suite.yml → tests/Functional.suite.yml

@@ -2,12 +2,11 @@
 #
 # Suite for functional tests
 # Emulate web requests and make application process them
-# Include one of framework modules (Symfony2, Yii2, Laravel5, Phalcon4) to use it
+# Include one of framework modules (Symfony, Yii2, Laravel, Phalcon5) to use it
 # Remove this suite if you don't use frameworks
 
 actor: FunctionalTester
 modules:
     enabled:
         # add a framework module here
-        - \Helper\Functional
-    step_decorators: ~        
+    step_decorators: ~

tests/_support/AcceptanceTester.php → tests/Support/AcceptanceTester.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace Tests;
+
+use Tests\_generated\AcceptanceTesterActions;
 
 /**
  * Inherited Methods
@@ -13,12 +16,12 @@
  * @method void am($role)
  * @method void lookForwardTo($achieveValue)
  * @method void comment($description)
- * @method void pause()
+ * @method void pause($vars = [])
  *
  * @SuppressWarnings(PHPMD)
  */
 class AcceptanceTester extends \Codeception\Actor {
-	use _generated\AcceptanceTesterActions;
+	use AcceptanceTesterActions;
 
 	/*
 	 * Define custom actions here

tests/_support/FunctionalTester.php → tests/Support/FunctionalTester.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace Tests;
+
+use Tests\_generated\FunctionalTesterActions;
 
 /**
  * Inherited Methods
@@ -13,12 +16,12 @@
  * @method void am($role)
  * @method void lookForwardTo($achieveValue)
  * @method void comment($description)
- * @method void pause()
+ * @method void pause($vars = [])
  *
  * @SuppressWarnings(PHPMD)
  */
 class FunctionalTester extends \Codeception\Actor {
-	use _generated\FunctionalTesterActions;
+	use FunctionalTesterActions;
 
 	/*
 	 * Define custom actions here

tests/_support/UnitTester.php → tests/Support/UnitTester.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace Tests;
+
+use Tests\_generated\UnitTesterActions;
 
 /**
  * Inherited Methods
@@ -13,12 +16,12 @@
  * @method void am($role)
  * @method void lookForwardTo($achieveValue)
  * @method void comment($description)
- * @method void pause()
+ * @method void pause($vars = [])
  *
  * @SuppressWarnings(PHPMD)
  */
 class UnitTester extends \Codeception\Actor {
-	use _generated\UnitTesterActions;
+	use UnitTesterActions;
 
 	/*
 	 * Define custom actions here

tests/Support/_generated/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/unit.suite.yml → tests/Unit.suite.yml

@@ -7,7 +7,6 @@ modules:
     enabled:
         - Asserts
         - Db
-        - \Helper\Unit
         - Like\Codeception\Phinx
     step_decorators: ~
     config:

tests/unit/FirstCest.php → tests/Unit/FirstCest.php

@@ -1,5 +1,9 @@
 <?php
 
+namespace Tests\Unit;
+
+use Tests\UnitTester;
+
 class FirstCest {
 	public function tryToTest(UnitTester $I) {
 		$I->seeNumRecords(0, 'user_logins');

tests/_output/.gitignore

@@ -1,2 +1,2 @@
 *
-!.gitignore
+!.gitignore