diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 672fd50..6655513 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,10 +34,8 @@ jobs: with: dependency-versions: ${{ matrix.dependencies }} - - run: vendor/bin/phpunit.phar --colors=always + - run: vendor/bin/phpunit --colors=always - - run: vendor/bin/php-cs-fixer.phar fix --dry-run --diff --ansi -v + - run: vendor/bin/php-cs-fixer fix --dry-run --diff --ansi -v - - run: vendor/bin/phan.phar --no-progress-bar --color - - - run: vendor/bin/composer-require-checker.phar --ansi -vvv + - run: vendor/bin/phan --no-progress-bar --color diff --git a/.travis.yml b/.travis.yml index 1fd5d63..c2e60bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,20 +10,18 @@ php: cache: directories: - $HOME/.composer/cache/ - - $HOME/.phive/ before_install: - composer install --prefer-dist --no-progress --no-suggest - mkdir -p build/logs/ script: - - vendor/bin/php-cs-fixer.phar fix --dry-run --diff --ansi -v - - vendor/bin/phan.phar --no-progress-bar --color --allow-polyfill-parser - - vendor/bin/composer-require-checker.phar --ansi -vvv - - vendor/bin/phpunit.phar --colors --coverage-text --coverage-clover build/logs/clover.xml + - vendor/bin/php-cs-fixer fix --dry-run --diff --ansi -v + - vendor/bin/phan --no-progress-bar --color --allow-polyfill-parser + - vendor/bin/phpunit --colors --coverage-text --coverage-clover build/logs/clover.xml after_success: - - travis_retry tools/php-coveralls -v + - travis_retry vendor/bin/php-coveralls -v branches: only: diff --git a/composer.json b/composer.json index fdae573..c628aca 100644 --- a/composer.json +++ b/composer.json @@ -13,23 +13,16 @@ "preferred-install": "dist", "sort-packages": true }, - "repositories": { - "pharhub": { - "type": "composer", - "url": "https://packages.pharhub.dev/" - } - }, "require": { "php": "^7.2", "ext-simplexml": "*", "ext-pcre": "*" }, "require-dev": { - "pharhub/composer-require-checker": "^2.1", - "pharhub/phan": "^3.2", - "pharhub/php-coveralls": "^2.4", - "pharhub/php-cs-fixer": "^2.17", - "pharhub/phpunit": "^8.5" + "friendsofphp/php-cs-fixer": "^2.17", + "phan/phan": "^4.0", + "php-coveralls/php-coveralls": "^2.4", + "phpunit/phpunit": "^8.5" }, "autoload": { "psr-4": { @@ -46,28 +39,24 @@ ], "scripts": { "test": [ - "@php vendor/bin/phpunit.phar --colors=always" + "@php vendor/bin/phpunit --colors=always" ], "coverage": [ - "@php vendor/bin/phpunit.phar --colors=always --coverage-html coverage" + "@php vendor/bin/phpunit --colors=always --coverage-html coverage" ], "cs": [ - "@php vendor/bin/php-cs-fixer.phar fix --dry-run --diff --ansi -v" + "@php vendor/bin/php-cs-fixer fix --dry-run --diff --ansi -v" ], "fix": [ - "@php vendor/bin/php-cs-fixer.phar fix --diff --ansi -v" + "@php vendor/bin/php-cs-fixer fix --diff --ansi -v" ], "phan": [ - "@php vendor/bin/phan.phar -p --color" - ], - "composer-require-checker": [ - "@php vendor/bin/composer-require-checker.phar --ansi -vvv" + "@php vendor/bin/phan -p --color" ], "qa": [ "@composer cs", "@composer phan", - "@composer test", - "@composer composer-require-checker" + "@composer test" ] } } diff --git a/tests/SampleTest.php b/tests/SampleTest.php index 43d6e89..88c01c1 100644 --- a/tests/SampleTest.php +++ b/tests/SampleTest.php @@ -3,8 +3,8 @@ use ngyuki\Skeleton\Sample; use PHPUnit\Framework\TestCase; -use function PHPUnit\assertEquals; -use function PHPUnit\assertFalse; +use function assertEquals; +use function assertFalse; /** * @author ngyuki