Merge pull request #248 from stronk7/move_to_moodle_cs

Move to moodle cs

Author: andrewnicols

README.md

@@ -11,7 +11,8 @@ integration happens.
 + Some checks require a MySQL, master-based site to be up and running.
 + Some checks require a PHP engine to run (other are pure shell scripts).
 + Some checks require the installation of 3rd part tools (phpunit...).
-+ Some checks require the presence of both local_codechecker and local_moodlecheck local plugins.
++ Some checks require the presence of local_moodlecheck local plugin.
++ To get all other dependencies installed, ensure that both composer and npm are run regularly.
 + You can run them standalone or also with the ease and functionalities coming with different tools like:
     - Jenkins: http://jenkins-php.org
     - Travis: https://docs.travis-ci.com/user/languages/php/

composer.json

@@ -1,6 +1,11 @@
 {
     "require": {
-        "squizlabs/php_codesniffer": "^3.5.8",
-        "mustache/mustache": "^2.11"
+        "moodlehq/moodle-cs": "^3.2.3",
+        "mustache/mustache": "^2.14.1"
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

initial_jenkins_moodle_setup/initial_jenkins_moodle_setup.sh

@@ -84,15 +84,6 @@ else
 fi
 cd ${basedir}/${gitdir}/${moodledir} && ${gitcmd} pull origin master && ${gitcmd} reset --hard v2.4.0-beta
 
-# Create the git clone for the codechecker, master branch and add it to .git/info/exclude
-if [ -d "${basedir}/${gitdir}/${moodledir}/local/codechecker" ]; then
-    echo "Skip https://github.com/moodlehq/moodle-local_codechecker.git already present at local/codechecker"
-else
-    cd ${basedir}/${gitdir}/${moodledir}/local && ${gitcmd} clone https://github.com/moodlehq/moodle-local_codechecker.git codechecker
-    echo local/codechecker >> ${basedir}/${gitdir}/${moodledir}/.git/info/exclude
-fi
-cd ${basedir}/${gitdir}/${moodledir}/local/codechecker && ${gitcmd} pull origin master && ${gitcmd} reset --hard origin/master
-
 # Create the git clone for the moodlecheck, master branch and add it to .git/info/exclude
 if [ -d "${basedir}/${gitdir}/${moodledir}/local/moodlecheck" ]; then
     echo "Skip https://github.com/moodlehq/moodle-local_moodlecheck.git already present at local/moodlecheck"

package-lock.json

@@ -16,7 +16,6 @@
 # $npmcmd: Optional, path to the npm executable (global)
 # $pushremote: (optional) Remote to push the results of prechecker to. Will create branches like MDL-1234-master-shorthash
 # $resettocommit: (optional) Should not be used in production runs. Reset $integrateto to a commit for testing purposes.
-# $phpcsstandard: (optional) directory for coding standard path
 
 # Don't want debugging @ start, but want exit on error
 set +x
@@ -315,6 +314,7 @@ echo "Info: Preparing npm"
 # the list of components available in the moodle-ci-site, because getting
 # the list from the checked branch does require installing the site completely and
 # that would slowdown the checker a lot. It's ok 99% of times.
+echo "Info: Calculating valid components..."
 ${phpcmd} ${mydir}/../list_valid_components/list_valid_components.php \
     --basedir="${WORKSPACE}" --absolute=true > "${WORKSPACE}/work/valid_components.txt"
 
@@ -489,22 +489,16 @@ ${phpcmd} ${WORKSPACE}/check_upgrade_savepoints.php > "${WORKSPACE}/work/savepoi
 cat "${WORKSPACE}/work/savepoints.txt" | ${phpcmd} ${mydir}/../check_upgrade_savepoints/savepoints2checkstyle.php > "${WORKSPACE}/work/savepoints.xml"
 rm ${WORKSPACE}/check_upgrade_savepoints.php
 
-# Run the PHPCS
-echo "Info: Running phpcs..."
-if [[ ! -n "${phpcsstandard}" ]]; then
-    phpcsstandard="${mydir}/../../codechecker/moodle"
-fi
 # Note we have to pass the full list of components (valid_components.txt) as calculated
 # earlier in the script when the whole code-base was available. Now, for performance
 # reasons, only the patch-modified files are remaining so we cannot use phpcs abilities
 # to detect all components anymore. Hence using the complete, already calculated, list.
 # Note we need to specify where both moodle and PHPCompatibility, specifically the later, standards sit.
 # TODO: Some day this will work from the moodle ruleset.xml file, it doesn't right now.
 ${phpcmd} ${mydir}/../vendor/bin/phpcs \
-    --runtime-set installed_paths "${phpcsstandard}","${phpcsstandard}/../PHPCompatibility" \
     --runtime-set moodleComponentsListPath "${WORKSPACE}/work/valid_components.txt" \
     --report=checkstyle --report-file="${WORKSPACE}/work/cs.xml" \
-    --extensions=php --standard=${phpcsstandard} ${WORKSPACE}
+    --extensions=php --standard=moodle ${WORKSPACE}
 
 if [[ -n "${LOCAL_CI_TESTS_RUNNING}" ]]; then
     # We don't run the moodlecheck tests in our testing environment because local_moodlecheck requires

remote_branch_checker/remote_branch_checker.sh

@@ -112,7 +112,7 @@ definedtests=$(grep -r "directory suffix" ${gitdir}/phpunit.xml | sed 's/^[^>]*>
 # Load all the existing tests
 existingtests=$(cd ${gitdir} && find . -name tests | sed 's/^\.\/\(.*\)$/\1/g')
 # Some well-known "tests" that we can ignore here
-ignoretests="local/codechecker/pear/PHP/tests lib/phpexcel/PHPExcel/Shared/JAMA/tests"
+ignoretests="lib/phpexcel/PHPExcel/Shared/JAMA/tests"
 # Unit test classes to look for with each file (must be 1 and only 1). MDLSITE-2096
 # TODO: Some day replace this with the list of abstract classes, from PHPUnit_Framework_TestCase using some classmap
 unittestclasses="basic_testcase advanced_testcase database_driver_testcase externallib_advanced_testcase data_loading_method_test_base question_testcase question_attempt_upgrader_test_base qbehaviour_walkthrough_test_base grade_base_testcase"

run_phpunittests/run_phpunittests.sh

@@ -27,8 +27,7 @@
 $plugin->version   = 2012113000;
 $plugin->requires  = 2013070400;        // Moodle 2.6dev (Build 20130704) and upwards.
 $plugin->dependencies = array(          // Also requires these plugins to be installed.
-    'local_codechecker' => '2012061600',
-    'local_moodlecheck' => '2012011000'
+    'local_moodlecheck' => '2012011000',
 );
 $plugin->component = 'local_ci';
 $plugin->release   = '0.9.1';

version.php

@@ -79,7 +79,7 @@ ${mydir}/../list_valid_components/list_valid_components.sh > "${WORKSPACE}/valid
 allfiles=$( find "${gitdir}" -name version.php | awk -F "/" '{print NF-1"\t"$0}' | sort -n | cut -f 2- )
 
 # version.php files to ignore
-ignorefiles="(local/(ci|codechecker|moodlecheck)/version.php|.*/tests/fixtures/.*/version.php)"
+ignorefiles="(local/(ci|moodlecheck)/version.php|.*/tests/fixtures/.*/version.php)"
 
 # Perform various checks with the version.php files
 for i in ${allfiles}; do