diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa2c840..ab9b0db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: push: branches: - 1.x + - 2.x pull_request: branches: - '*' diff --git a/composer.json b/composer.json index b3c5307..4c2504b 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "composer-plugin-api": "^2.0" }, "require-dev": { - "cakephp/cakephp-codesniffer": "5.x-dev", + "cakephp/cakephp-codesniffer": "^5.0", "composer/composer": "^2.0", "phpunit/phpunit": "^9.5.19" }, diff --git a/tests/TestCase/PluginTest.php b/tests/TestCase/PluginTest.php index 85e6031..766fb1b 100644 --- a/tests/TestCase/PluginTest.php +++ b/tests/TestCase/PluginTest.php @@ -14,32 +14,23 @@ class PluginTest extends TestCase { - /** - * @var \Composer\Composer - */ - protected $composer; + protected Composer $composer; - /** - * @var \Composer\Package\Package - */ - protected $package; + protected Package $package; /** * @var \Composer\IO\IOInterface&\PHPUnit\Framework\MockObject\MockObject */ protected $io; - /** - * @var \Cake\Composer\Plugin - */ - protected $plugin; + protected Plugin $plugin; /** * Directories used during tests * - * @var array + * @var array */ - protected $testDirs = [ + protected array $testDirs = [ '', 'vendor', 'plugins', @@ -51,6 +42,8 @@ class PluginTest extends TestCase 'app_plugins/Bar', ]; + protected string $path; + /** * setUp *