diff --git a/.travis.yml b/.travis.yml index 386df2727..951bd0c8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ jobs: services: - mysql before_script: - - npm install grunt grunt-cli grunt-contrib-jshint grunt-contrib-csslint grunt-phplint --save-dev - mysql -u root -e "CREATE DATABASE rhymix CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci" - mysql -u root -e "GRANT ALL PRIVILEGES ON rhymix.* TO travis@localhost" - mysql -u root -e "SET PASSWORD FOR travis@localhost = PASSWORD('travis'); FLUSH PRIVILEGES" @@ -21,7 +20,7 @@ before_script: - wget https://codeception.com/releases/2.3.9/codecept.phar - php -S localhost:8000 & script: - - grunt lint + - if find . -name "*.php" ! -path "./vendor/*" -print0 | xargs -0 -n 1 -P 8 php -l | grep -v "No syntax errors detected"; then exit 1; fi - php codecept.phar build - php codecept.phar run --debug --fail-fast --env travis notifications: diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index 8144ce46e..000000000 --- a/Gruntfile.js +++ /dev/null @@ -1,87 +0,0 @@ -module.exports = function(grunt) { - "use strict"; - - grunt.file.defaultEncoding = 'utf8'; - - grunt.initConfig({ - jshint: { - files: [ - 'Gruntfile.js', - 'common/js/*.js', - 'modules/admin/tpl/js/*.js', - 'modules/board/tpl/js/*.js', - 'modules/board/skins/*/*.js', - 'modules/editor/tpl/js/*.js', - 'modules/menu/tpl/js/*.js', - 'modules/widget/tpl/js/*.js', - ], - options : { - ignores : [ - '**/jquery*.js', - '**/swfupload.js', - '**/**.min.js', - '**/*-packed.js', - '**/*.compressed.js', - '**/jquery-*.js', - '**/jquery.*.js', - 'common/js/html5.js', - 'common/js/x.js', - 'common/js/xe.js', - 'common/js/xml2json.js', - 'common/js/modernizr.js', - 'vendor/**', - 'tests/**', - ] - } - }, - csslint: { - 'common-css': { - options: { - import : 2, - 'adjoining-classes' : false, - 'box-model' : false, - 'box-sizing' : false, - 'font-sizes' : false, - 'duplicate-background-images' : false, - 'order-alphabetical' : false, - 'ids' : false, - 'important' : false, - 'overqualified-elements' : false, - 'qualified-headings' : false, - 'star-property-hack' : false, - 'underscore-property-hack' : false, - }, - src: [ - 'common/css/*.css', - '!common/css/bootstrap.css', - '!common/css/bootstrap-responsive.css', - '!**/*.min.css', - '!vendor/**', - '!tests/**', - ] - } - }, - phplint: { - default : { - options: { - phpCmd: "php", - }, - src: [ - "**/*.php", - "!files/**", - "!tests/**", - "!tools/**", - "!common/libraries/**", - "!vendor/**", - "!tests/_output/**" - ], - }, - } - }); - - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-csslint'); - grunt.loadNpmTasks('grunt-phplint'); - - grunt.registerTask('lint', ['jshint', 'csslint', 'phplint']); -};