diff --git a/.scrutinizer.yml b/.scrutinizer.yml index db104bc..a0200ae 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -18,7 +18,3 @@ build: - php-scrutinizer-run - phpcs-run -tools: - external_code_coverage: - runs: 2 # Scrutinizer will wait for two code coverage submissions (unit and integration test suites) - timeout: 2400 # Timeout in seconds. \ No newline at end of file diff --git a/.travis/before_script.sh b/.travis/before_script.sh deleted file mode 100755 index dcff9d1..0000000 --- a/.travis/before_script.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env bash - -set -ex -trap '>&2 echo Error: Command \`$BASH_COMMAND\` on line $LINENO failed with exit code $?' ERR - -# mock mail -sudo service postfix stop -echo # print a newline -smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 & -echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/sendmail.ini - -# adjust memory limit -echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini -phpenv rehash; - -composer selfupdate - -# clone main magento github repository -git clone --branch $MAGENTO_VERSION --depth=1 https://github.com/magento/magento2 - -# install Magento -cd magento2 - -# add composer package under test, composer require will trigger update/install -composer config minimum-stability dev -composer config repositories.travis_to_test git https://github.com/${TRAVIS_REPO_SLUG}.git -if [ ! -z $TRAVIS_TAG ] -then - composer require ${COMPOSER_PACKAGE_NAME}:${TRAVIS_TAG} -elif [ ! -z $TRAVIS_PULL_REQUEST_BRANCH ] -then - # For pull requests, use the remote repository - composer config repositories.travis_to_test git https://github.com/${TRAVIS_PULL_REQUEST_SLUG}.git - composer require ${COMPOSER_PACKAGE_NAME}:dev-${TRAVIS_PULL_REQUEST_BRANCH}\#${TRAVIS_PULL_REQUEST_SHA} -else - composer require ${COMPOSER_PACKAGE_NAME}:dev-${TRAVIS_BRANCH}\#${TRAVIS_COMMIT} -fi - -# Add tests/src to autoload-dev on project level -php -r '$composer_json = json_decode(file_get_contents("composer.json"), true); -$composer_json["autoload-dev"]["psr-4"]["IntegerNet\\ConfigurableWysiwyg\\"] = "vendor/integer-net/magento2-configurable-wysiwyg/src"; -file_put_contents("composer.json", json_encode($composer_json));' -composer dumpautoload - -# prepare for test suite -case $TEST_SUITE in - integration) - cp vendor/$COMPOSER_PACKAGE_NAME/tests/integration/phpunit.xml.dist dev/tests/integration/phpunit.xml - - cd dev/tests/integration - - # create database and move db config into place - mysql -uroot -e ' - SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; - CREATE DATABASE magento_integration_tests; - ' - cp etc/install-config-mysql.php.dist etc/install-config-mysql.php - # Remove AMQP configuration - sed -i '/amqp/d' etc/install-config-mysql.php - # Remove default root password - sed -i 's/123123q//' etc/install-config-mysql.php - - cd ../../.. - ;; - unit) - cp vendor/$COMPOSER_PACKAGE_NAME/tests/unit/phpunit.xml.dist dev/tests/unit/phpunit.xml - ;; -esac diff --git a/README.md b/README.md index b8aac67..7f07f80 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ [![Software License][ico-license]](LICENSE.md) ![Supported Magento Versions][ico-compatibility] -[![Coverage Status][ico-scrutinizer]][link-scrutinizer] [![Quality Score][ico-code-quality]][link-code-quality] [![Maintainability][ico-maintainability]][link-maintainability] @@ -38,13 +37,6 @@ Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed re Please see [CONTRIBUTING](CONTRIBUTING.md) for details. -## Testing - -### Unit Tests - -``` -vendor/bin/phpunit tests/unit -``` ## Security @@ -61,7 +53,6 @@ The MIT License (MIT). Please see [License File](LICENSE) for more information. [ico-version]: https://img.shields.io/packagist/v/integer-net/magento2-configurable-wysiwyg.svg?style=flat-square [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square -[ico-scrutinizer]: https://img.shields.io/scrutinizer/coverage/g/integer-net/magento2-configurable-wysiwyg?style=flat-square [ico-code-quality]: https://img.shields.io/scrutinizer/g/integer-net/magento2-configurable-wysiwyg.svg?style=flat-square [ico-maintainability]: https://img.shields.io/codeclimate/maintainability/integer-net/magento2-configurable-wysiwyg?style=flat-square [ico-compatibility]: https://img.shields.io/badge/magento-2.3%20|%202.4-brightgreen.svg?logo=magento&longCache=true&style=flat-square diff --git a/composer.json b/composer.json index 9379161..c91c281 100644 --- a/composer.json +++ b/composer.json @@ -18,11 +18,6 @@ "IntegerNet\\ConfigurableWysiwyg\\": "src" } }, - "autoload-dev": { - "psr-4": { - "IntegerNet\\ConfigurableWysiwyg\\": "tests/src" - } - }, "repositories": [ { "type": "composer", @@ -35,7 +30,6 @@ }, "require-dev": { "roave/security-advisories": "dev-master", - "phpunit/phpunit": "^6.0|^9.0", "pds/skeleton": "^1.0", "phpro/grumphp": "^v0.21.0", "phpstan/phpstan": "^0.12.0",