Merge pull request #1678 from Automattic/sensei-phpcs-take-2

Add Sensei Coding Standard Step to circleci

circle.yml

@@ -12,6 +12,7 @@ machine:
     CIRCLE_ENV: test
     WP_MULTISITE: 0
     WP_CORE_DIR: /home/ubuntu/wordpress-develop
+    SENSEI_CODING_STANDARD_DIR: /home/ubuntu/sensei_coding_standard
     WP_TESTS_DIR: /home/ubuntu/wordpress-develop/tests/phpunit
     plugin_loc: /home/ubuntu/$CIRCLE_PROJECT_REPONAME
     plugin_slug: $CIRCLE_PROJECT_REPONAME
@@ -34,9 +35,12 @@ dependencies:
       # setup phpunit
       - wget https://phar.phpunit.de/phpunit-old.phar && chmod +x phpunit-old.phar && mv phpunit-old.phar /home/ubuntu/.phpenv/shims/phpunit
       #Sensei Specific remove npm file as it is not needed
+      # Clone sensei-coding-standard
+      - git clone https://github.com/Automattic/sensei-coding-standard.git $SENSEI_CODING_STANDARD_DIR;
 
 ## tests override
 test:
   override:
   #run tests with coverage
+  - cd $SENSEI_CODING_STANDARD_DIR; php bin/phpcs.phar --report-full --report-summary --standard=Sensei $plugin_loc
   - cd $plugin_loc; phpunit #ignoring coverage for speed reasons: --coverage-html $CIRCLE_ARTIFACTS

includes/class-sensei-quiz.php

@@ -1214,9 +1214,10 @@ public static function  the_user_status_message( $quiz_id ){
         $lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
         $status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id , get_current_user_id() );
         $message = '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
+        $messages = Sensei()->frontend->messages;
 
-        if ( !empty( Sensei()->frontend->messages ) ) {
-          $message .= Sensei()->frontend->messages;
+        if ( !empty( $messages ) ) {
+          $message .= $messages;
         }
 
         echo $message;