From 70bcacfe533a5d07e7a8ddddb9f9a5aba4b2b771 Mon Sep 17 00:00:00 2001 From: David Pesce <davidpesce@gmail.com> Date: Sun, 11 Jun 2017 15:15:34 -0400 Subject: [PATCH] more codeclimate fixes --- .../docs/examples/AssignmentGraded.json | 2 +- lib/emitter/src/Events/AssignmentGraded.php | 4 ++-- .../src/Events/AssignmentSubmitted.php | 2 +- lib/emitter/src/Events/AttemptCompleted.php | 2 +- lib/emitter/src/Events/AttemptStarted.php | 2 +- lib/emitter/src/Events/Attended.php | 2 +- lib/emitter/src/Events/CourseCompleted.php | 2 +- lib/emitter/src/Events/EnrolmentCreated.php | 2 +- lib/emitter/src/Events/Event.php | 6 ++--- lib/emitter/src/Events/EventEnrol.php | 2 +- lib/emitter/src/Events/EventUnenrol.php | 2 +- lib/emitter/src/Events/QuestionAnswered.php | 2 +- lib/emitter/src/Events/ScormEvent.php | 2 +- lib/emitter/src/Events/ScormLaunched.php | 2 +- .../src/Events/ScormScoreRawSubmitted.php | 2 +- .../src/Events/ScormStatusSubmitted.php | 2 +- lib/emitter/src/Events/UserLoggedin.php | 2 +- lib/emitter/src/Events/UserLoggedout.php | 2 +- lib/emitter/src/Events/UserRegistered.php | 2 +- lib/emitter/src/Events/Viewed.php | 2 +- lib/emitter/tests/AssignmentGradedTest.php | 2 +- lib/emitter/tests/EventTest.php | 12 +++++----- .../docs/examples/FeedbackSubitted.json | 2 +- lib/expander/src/Events/AssignmentGraded.php | 8 +++---- lib/expander/src/Events/AttemptEvent.php | 4 ++-- lib/expander/src/Events/ScormLaunched.php | 6 ++--- lib/expander/tests/EventTest.php | 8 +++---- lib/translator/src/Controller.php | 6 ++--- lib/translator/tests/AttemptStartedTest.php | 4 ++-- lib/translator/tests/CourseCompletedTest.php | 6 ++--- lib/translator/tests/DiscussionViewedTest.php | 4 ++-- lib/translator/tests/EventTest.php | 24 +++++++++---------- .../tests/FeedbackSubmittedTest.php | 4 ++-- lib/translator/tests/ModuleViewedTest.php | 4 ++-- 34 files changed, 70 insertions(+), 70 deletions(-) diff --git a/lib/emitter/docs/examples/AssignmentGraded.json b/lib/emitter/docs/examples/AssignmentGraded.json index 1a82e09..cc00d0f 100644 --- a/lib/emitter/docs/examples/AssignmentGraded.json +++ b/lib/emitter/docs/examples/AssignmentGraded.json @@ -84,7 +84,7 @@ "verb": { "id": "http:\/\/adlnet.gov\/expapi\/verbs\/scored", "display": { - "en": "recieved grade for" + "en": "received grade for" } }, "result": { diff --git a/lib/emitter/src/Events/AssignmentGraded.php b/lib/emitter/src/Events/AssignmentGraded.php index 37afef1..7f62545 100644 --- a/lib/emitter/src/Events/AssignmentGraded.php +++ b/lib/emitter/src/Events/AssignmentGraded.php @@ -1,8 +1,8 @@ <?php namespace XREmitter\Events; class AssignmentGraded extends Event { - protected static $verb_display = [ - 'en' => 'recieved grade for' + protected static $verbDisplay = [ + 'en' => 'received grade for' ]; /** diff --git a/lib/emitter/src/Events/AssignmentSubmitted.php b/lib/emitter/src/Events/AssignmentSubmitted.php index bca3fba..3c3bff7 100644 --- a/lib/emitter/src/Events/AssignmentSubmitted.php +++ b/lib/emitter/src/Events/AssignmentSubmitted.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class AssignmentSubmitted extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'completed' ]; diff --git a/lib/emitter/src/Events/AttemptCompleted.php b/lib/emitter/src/Events/AttemptCompleted.php index ad7e4cf..4fc9efb 100644 --- a/lib/emitter/src/Events/AttemptCompleted.php +++ b/lib/emitter/src/Events/AttemptCompleted.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class AttemptCompleted extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'completed' ]; diff --git a/lib/emitter/src/Events/AttemptStarted.php b/lib/emitter/src/Events/AttemptStarted.php index 9a32659..6c1d5ca 100644 --- a/lib/emitter/src/Events/AttemptStarted.php +++ b/lib/emitter/src/Events/AttemptStarted.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class AttemptStarted extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'started' ]; diff --git a/lib/emitter/src/Events/Attended.php b/lib/emitter/src/Events/Attended.php index 99beff8..1b524c1 100755 --- a/lib/emitter/src/Events/Attended.php +++ b/lib/emitter/src/Events/Attended.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class Attended extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'attended' ]; diff --git a/lib/emitter/src/Events/CourseCompleted.php b/lib/emitter/src/Events/CourseCompleted.php index 8abc0b8..456a7a7 100644 --- a/lib/emitter/src/Events/CourseCompleted.php +++ b/lib/emitter/src/Events/CourseCompleted.php @@ -19,7 +19,7 @@ class CourseCompleted extends Event * Sets the language equivalent for completed. * @var array */ - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'completed' ]; /** diff --git a/lib/emitter/src/Events/EnrolmentCreated.php b/lib/emitter/src/Events/EnrolmentCreated.php index 1f2213f..5382dea 100644 --- a/lib/emitter/src/Events/EnrolmentCreated.php +++ b/lib/emitter/src/Events/EnrolmentCreated.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class EnrolmentCreated extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'enrolled onto' ]; diff --git a/lib/emitter/src/Events/Event.php b/lib/emitter/src/Events/Event.php index 9b323cf..f3c78ac 100644 --- a/lib/emitter/src/Events/Event.php +++ b/lib/emitter/src/Events/Event.php @@ -2,7 +2,7 @@ use \stdClass as PhpObj; abstract class Event extends PhpObj { - protected static $verb_display; + protected static $verbDisplay; /** * Reads data for an event. @@ -130,8 +130,8 @@ abstract class Event extends PhpObj { protected function readVerbDisplay($opts) { $lang = $opts['context_lang']; - $lang = isset(static::$verb_display[$lang]) ? $lang : array_keys(static::$verb_display)[0]; - return [$lang => static::$verb_display[$lang]]; + $lang = isset(static::$verbDisplay[$lang]) ? $lang : array_keys(static::$verbDisplay)[0]; + return [$lang => static::$verbDisplay[$lang]]; } } diff --git a/lib/emitter/src/Events/EventEnrol.php b/lib/emitter/src/Events/EventEnrol.php index ab0230f..949f2d5 100755 --- a/lib/emitter/src/Events/EventEnrol.php +++ b/lib/emitter/src/Events/EventEnrol.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class EventEnrol extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'registered for' ]; diff --git a/lib/emitter/src/Events/EventUnenrol.php b/lib/emitter/src/Events/EventUnenrol.php index 9a00e46..a4e6393 100755 --- a/lib/emitter/src/Events/EventUnenrol.php +++ b/lib/emitter/src/Events/EventUnenrol.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class EventUnenrol extends EventEnrol { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'unregistered from' ]; diff --git a/lib/emitter/src/Events/QuestionAnswered.php b/lib/emitter/src/Events/QuestionAnswered.php index f757fa8..cffed7a 100644 --- a/lib/emitter/src/Events/QuestionAnswered.php +++ b/lib/emitter/src/Events/QuestionAnswered.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class QuestionAnswered extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'answered' ]; diff --git a/lib/emitter/src/Events/ScormEvent.php b/lib/emitter/src/Events/ScormEvent.php index 0f59da3..2181f75 100644 --- a/lib/emitter/src/Events/ScormEvent.php +++ b/lib/emitter/src/Events/ScormEvent.php @@ -40,7 +40,7 @@ class ScormEvent extends Event { $verb = 'completed'; } - static::$verb_display = ['en' => $verb]; + static::$verbDisplay = ['en' => $verb]; $lang = [ 'id' => $verbUrl, diff --git a/lib/emitter/src/Events/ScormLaunched.php b/lib/emitter/src/Events/ScormLaunched.php index dc2e452..a43d584 100644 --- a/lib/emitter/src/Events/ScormLaunched.php +++ b/lib/emitter/src/Events/ScormLaunched.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class ScormLaunched extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'launched' ]; diff --git a/lib/emitter/src/Events/ScormScoreRawSubmitted.php b/lib/emitter/src/Events/ScormScoreRawSubmitted.php index 7285a78..e32142d 100644 --- a/lib/emitter/src/Events/ScormScoreRawSubmitted.php +++ b/lib/emitter/src/Events/ScormScoreRawSubmitted.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class ScormScoreRawSubmitted extends ScormEvent { - protected static $verb_display; + protected static $verbDisplay; /** * Reads data for an event. diff --git a/lib/emitter/src/Events/ScormStatusSubmitted.php b/lib/emitter/src/Events/ScormStatusSubmitted.php index 9ecab95..9837023 100644 --- a/lib/emitter/src/Events/ScormStatusSubmitted.php +++ b/lib/emitter/src/Events/ScormStatusSubmitted.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class ScormStatusSubmitted extends ScormEvent { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'completed' ]; diff --git a/lib/emitter/src/Events/UserLoggedin.php b/lib/emitter/src/Events/UserLoggedin.php index 70f8e87..e6bf20d 100644 --- a/lib/emitter/src/Events/UserLoggedin.php +++ b/lib/emitter/src/Events/UserLoggedin.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class UserLoggedin extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'logged in to' ]; diff --git a/lib/emitter/src/Events/UserLoggedout.php b/lib/emitter/src/Events/UserLoggedout.php index c661695..33f6aaf 100644 --- a/lib/emitter/src/Events/UserLoggedout.php +++ b/lib/emitter/src/Events/UserLoggedout.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class UserLoggedout extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'logged out of' ]; diff --git a/lib/emitter/src/Events/UserRegistered.php b/lib/emitter/src/Events/UserRegistered.php index f756484..0b43d26 100644 --- a/lib/emitter/src/Events/UserRegistered.php +++ b/lib/emitter/src/Events/UserRegistered.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; class UserRegistered extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'registered to' ]; diff --git a/lib/emitter/src/Events/Viewed.php b/lib/emitter/src/Events/Viewed.php index be1976f..9e218d4 100644 --- a/lib/emitter/src/Events/Viewed.php +++ b/lib/emitter/src/Events/Viewed.php @@ -1,7 +1,7 @@ <?php namespace XREmitter\Events; abstract class Viewed extends Event { - protected static $verb_display = [ + protected static $verbDisplay = [ 'en' => 'viewed' ]; diff --git a/lib/emitter/tests/AssignmentGradedTest.php b/lib/emitter/tests/AssignmentGradedTest.php index 7888160..2456c15 100644 --- a/lib/emitter/tests/AssignmentGradedTest.php +++ b/lib/emitter/tests/AssignmentGradedTest.php @@ -40,7 +40,7 @@ class AssignmentGradedTest extends EventTest { $output['context']['extensions']['http://lrs.learninglocker.net/define/extensions/info'] ); $this->assertValidXapiStatement($output); - $this->assertVerb('http://adlnet.gov/expapi/verbs/scored', 'recieved grade for', $output['verb']); + $this->assertVerb('http://adlnet.gov/expapi/verbs/scored', 'received grade for', $output['verb']); $this->assertObject('module', $input, $output['object']); $this->assertObject('course', $input, $output['context']['contextActivities']['parent'][0]); $this->assertEquals($input['grade_score_raw'], $output['result']['score']['raw']); diff --git a/lib/emitter/tests/EventTest.php b/lib/emitter/tests/EventTest.php index dffb7c8..ba74959 100644 --- a/lib/emitter/tests/EventTest.php +++ b/lib/emitter/tests/EventTest.php @@ -170,8 +170,8 @@ abstract class EventTest extends PhpUnitTestCase { $this->assertEquals($input[$type.'_description'], $output['definition']['description'][$input['context_lang']]); } - protected function assertVerb($verb_id, $verb_name, $output) { - $this->assertEquals($verb_id, $output['id']); + protected function assertVerb($verbId, $verb_name, $output) { + $this->assertEquals($verbId, $output['id']); $this->assertEquals($verb_name, $output['display']['en']); } @@ -199,9 +199,9 @@ abstract class EventTest extends PhpUnitTestCase { } protected function createExampleFile($output) { - $class_array = explode('\\', get_class($this)); - $event_name = str_replace('Test', '', array_pop($class_array)); - $example_file = __DIR__.'/../docs/examples/'.$event_name.'.json'; - file_put_contents($example_file, json_encode($output, JSON_PRETTY_PRINT)); + $classArray = explode('\\', get_class($this)); + $eventName = str_replace('Test', '', array_pop($classArray)); + $exampleFile = __DIR__.'/../docs/examples/'.$eventName.'.json'; + file_put_contents($exampleFile, json_encode($output, JSON_PRETTY_PRINT)); } } diff --git a/lib/expander/docs/examples/FeedbackSubitted.json b/lib/expander/docs/examples/FeedbackSubitted.json index dced476..6944c74 100644 --- a/lib/expander/docs/examples/FeedbackSubitted.json +++ b/lib/expander/docs/examples/FeedbackSubitted.json @@ -116,6 +116,6 @@ "type": "object" } }, - "timemodified": 1497207558 + "timemodified": 1497208516 } } \ No newline at end of file diff --git a/lib/expander/src/Events/AssignmentGraded.php b/lib/expander/src/Events/AssignmentGraded.php index c1c8d0f..5ad816c 100644 --- a/lib/expander/src/Events/AssignmentGraded.php +++ b/lib/expander/src/Events/AssignmentGraded.php @@ -9,12 +9,12 @@ class AssignmentGraded extends Event { */ public function read(array $opts) { $grade = $this->repo->readObject($opts['objectid'], $opts['objecttable']); - $grade_comment = $this->repo->readGradeComment($grade->id, $grade->assignment)->commenttext; - $grade_items = $this->repo->readGradeItems($grade->assignment, 'assign'); + $gradeComment = $this->repo->readGradeComment($grade->id, $grade->assignment)->commenttext; + $gradeItems = $this->repo->readGradeItems($grade->assignment, 'assign'); return array_merge(parent::read($opts), [ 'grade' => $grade, - 'grade_comment' => $grade_comment, - 'grade_items' => $grade_items, + 'grade_comment' => $gradeComment, + 'grade_items' => $gradeItems, 'graded_user' => $this->repo->readUser($grade->userid), 'module' => $this->repo->readModule($grade->assignment, 'assign'), ]); diff --git a/lib/expander/src/Events/AttemptEvent.php b/lib/expander/src/Events/AttemptEvent.php index 6208551..9946d48 100644 --- a/lib/expander/src/Events/AttemptEvent.php +++ b/lib/expander/src/Events/AttemptEvent.php @@ -9,14 +9,14 @@ class AttemptEvent extends Event { */ public function read(array $opts) { $attempt = $this->repo->readAttempt($opts['objectid']); - $grade_items = $this->repo->readGradeItems($attempt->quiz, 'quiz'); + $gradeItems = $this->repo->readGradeItems($attempt->quiz, 'quiz'); $attempt->questions = $this->repo->readQuestionAttempts($attempt->id); $questions = $this->repo->readQuestions($attempt->quiz); return array_merge(parent::read($opts), [ 'attempt' => $attempt, 'module' => $this->repo->readModule($attempt->quiz, 'quiz'), - 'grade_items' => $grade_items, + 'grade_items' => $gradeItems, 'questions' => $questions ]); } diff --git a/lib/expander/src/Events/ScormLaunched.php b/lib/expander/src/Events/ScormLaunched.php index 0d0f928..6758093 100644 --- a/lib/expander/src/Events/ScormLaunched.php +++ b/lib/expander/src/Events/ScormLaunched.php @@ -8,10 +8,10 @@ class ScormLaunched extends Event { * @override Event */ public function read(array $opts) { - $scorm_scoes = $this->repo->readObject($opts['objectid'], $opts['objecttable']); + $scormScoes = $this->repo->readObject($opts['objectid'], $opts['objecttable']); return array_merge(parent::read($opts), [ - 'module' => $this->repo->readModule($scorm_scoes->scorm, 'scorm'), - 'scorm_scoes' => $scorm_scoes + 'module' => $this->repo->readModule($scormScoes->scorm, 'scorm'), + 'scorm_scoes' => $scormScoes ]); } } \ No newline at end of file diff --git a/lib/expander/tests/EventTest.php b/lib/expander/tests/EventTest.php index a8737c6..c4753e5 100644 --- a/lib/expander/tests/EventTest.php +++ b/lib/expander/tests/EventTest.php @@ -92,9 +92,9 @@ class EventTest extends PhpUnitTestCase { } protected function createExampleFile($output) { - $class_array = explode('\\', get_class($this)); - $event_name = str_replace('Test', '', array_pop($class_array)); - $example_file = __DIR__.'/../docs/examples/'.$event_name.'.json'; - file_put_contents($example_file, json_encode($output, JSON_PRETTY_PRINT)); + $classArray = explode('\\', get_class($this)); + $eventName = str_replace('Test', '', array_pop($classArray)); + $exampleFile = __DIR__.'/../docs/examples/'.$eventName.'.json'; + file_put_contents($exampleFile, json_encode($output, JSON_PRETTY_PRINT)); } } diff --git a/lib/translator/src/Controller.php b/lib/translator/src/Controller.php index e6b672f..66dc250 100644 --- a/lib/translator/src/Controller.php +++ b/lib/translator/src/Controller.php @@ -62,10 +62,10 @@ class Controller extends PhpObj { foreach ($events as $index => $opts) { $route = isset($opts['event']['eventname']) ? $opts['event']['eventname'] : ''; if (isset(static::$routes[$route])) { - $route_events = is_array(static::$routes[$route]) ? static::$routes[$route] : [static::$routes[$route]]; - foreach ($route_events as $route_event) { + $routeEvents = is_array(static::$routes[$route]) ? static::$routes[$route] : [static::$routes[$route]]; + foreach ($routeEvents as $routeEvent) { try { - $event = '\MXTranslator\Events\\'.$route_event; + $event = '\MXTranslator\Events\\'.$routeEvent; foreach ((new $event())->read($opts) as $index => $result) { array_push($results, $result); } diff --git a/lib/translator/tests/AttemptStartedTest.php b/lib/translator/tests/AttemptStartedTest.php index 4250de7..7ad689f 100644 --- a/lib/translator/tests/AttemptStartedTest.php +++ b/lib/translator/tests/AttemptStartedTest.php @@ -36,11 +36,11 @@ class AttemptStartedTest extends ModuleViewedTest { } protected function assertAttempt($input, $output) { - $ext_key = 'http://lrs.learninglocker.net/define/extensions/moodle_attempt'; + $extKey = 'http://lrs.learninglocker.net/define/extensions/moodle_attempt'; $this->assertEquals($input->url, $output['attempt_url']); $this->assertEquals($input->name, $output['attempt_name']); $this->assertEquals(static::$xapiType.$input->type, $output['attempt_type']); $this->assertEquals($input, $output['attempt_ext']); - $this->assertEquals($ext_key, $output['attempt_ext_key']); + $this->assertEquals($extKey, $output['attempt_ext_key']); } } diff --git a/lib/translator/tests/CourseCompletedTest.php b/lib/translator/tests/CourseCompletedTest.php index 70f3067..ecf667a 100644 --- a/lib/translator/tests/CourseCompletedTest.php +++ b/lib/translator/tests/CourseCompletedTest.php @@ -32,12 +32,12 @@ class CourseCompletedTest extends EventTest { /** * Constructs the event with the given event name - * @param $event_name + * @param $eventName * @return array */ - private function constructEvent($event_name) { + private function constructEvent($eventName) { return [ - 'eventname' => $event_name, + 'eventname' => $eventName, 'timecreated' => 1433946701, ]; } diff --git a/lib/translator/tests/DiscussionViewedTest.php b/lib/translator/tests/DiscussionViewedTest.php index 2b61493..661c892 100644 --- a/lib/translator/tests/DiscussionViewedTest.php +++ b/lib/translator/tests/DiscussionViewedTest.php @@ -34,12 +34,12 @@ class DiscussionViewedTest extends ModuleViewedTest { } private function assertDiscussion($input, $output, $type) { - $ext_key = 'http://lrs.learninglocker.net/define/extensions/moodle_discussion'; + $extKey = 'http://lrs.learninglocker.net/define/extensions/moodle_discussion'; $this->assertEquals($input->url, $output[$type.'_url']); $this->assertEquals($input->name, $output[$type.'_name']); $this->assertEquals('A Moodle discussion.', $output[$type.'_description']); $this->assertEquals(static::$xapiType.$input->type, $output[$type.'_type']); $this->assertEquals($input, $output[$type.'_ext']); - $this->assertEquals($ext_key, $output[$type.'_ext_key']); + $this->assertEquals($extKey, $output[$type.'_ext_key']); } } diff --git a/lib/translator/tests/EventTest.php b/lib/translator/tests/EventTest.php index 49ce6b5..55ae992 100644 --- a/lib/translator/tests/EventTest.php +++ b/lib/translator/tests/EventTest.php @@ -56,9 +56,9 @@ abstract class EventTest extends PhpUnitTestCase { ]; } - private function constructEvent($event_name) { + private function constructEvent($eventName) { return [ - 'eventname' => $event_name, + 'eventname' => $eventName, 'timecreated' => 1433946701, ]; } @@ -116,18 +116,18 @@ abstract class EventTest extends PhpUnitTestCase { } protected function assertCourse($input, $output, $type) { - $ext_key = 'http://lrs.learninglocker.net/define/extensions/moodle_course'; + $extKey = 'http://lrs.learninglocker.net/define/extensions/moodle_course'; $this->assertEquals($input->lang, $output['context_lang']); $this->assertEquals($input->url, $output[$type.'_url']); $this->assertEquals($input->fullname, $output[$type.'_name']); $this->assertEquals(strip_tags($input->summary), $output[$type.'_description']); $this->assertEquals(static::$xapiType.$input->type, $output[$type.'_type']); $this->assertEquals($input, $output[$type.'_ext']); - $this->assertEquals($ext_key, $output[$type.'_ext_key']); + $this->assertEquals($extKey, $output[$type.'_ext_key']); } protected function assertApp($input, $output, $type) { - $ext_key = 'http://lrs.learninglocker.net/define/extensions/moodle_course'; + $extKey = 'http://lrs.learninglocker.net/define/extensions/moodle_course'; $app_type = 'http://id.tincanapi.com/activitytype/site'; $this->assertEquals($input->lang, $output['context_lang']); $this->assertEquals($input->url, $output[$type.'_url']); @@ -135,7 +135,7 @@ abstract class EventTest extends PhpUnitTestCase { $this->assertEquals(strip_tags($input->summary), $output[$type.'_description']); $this->assertEquals($app_type, $output[$type.'_type']); $this->assertEquals($input, $output[$type.'_ext']); - $this->assertEquals($ext_key, $output[$type.'_ext_key']); + $this->assertEquals($extKey, $output[$type.'_ext_key']); } protected function assertSource($input, $output, $type) { @@ -148,10 +148,10 @@ abstract class EventTest extends PhpUnitTestCase { } private function assertEvent($input, $output) { - $ext_key = 'http://lrs.learninglocker.net/define/extensions/moodle_logstore_standard_log'; + $extKey = 'http://lrs.learninglocker.net/define/extensions/moodle_logstore_standard_log'; $this->assertEquals('Moodle', $output['context_platform']); $this->assertEquals($input, $output['context_ext']); - $this->assertEquals($ext_key, $output['context_ext_key']); + $this->assertEquals($extKey, $output['context_ext_key']); $this->assertEquals(date('c', $input['timecreated']), $output['time']); } @@ -163,9 +163,9 @@ abstract class EventTest extends PhpUnitTestCase { } protected function createExampleFile($output) { - $class_array = explode('\\', get_class($this)); - $event_name = str_replace('Test', '', array_pop($class_array)); - $example_file = __DIR__.'/../docs/examples/'.$event_name.'.json'; - file_put_contents($example_file, json_encode($output, JSON_PRETTY_PRINT)); + $classArray = explode('\\', get_class($this)); + $eventName = str_replace('Test', '', array_pop($classArray)); + $exampleFile = __DIR__.'/../docs/examples/'.$eventName.'.json'; + file_put_contents($exampleFile, json_encode($output, JSON_PRETTY_PRINT)); } } diff --git a/lib/translator/tests/FeedbackSubmittedTest.php b/lib/translator/tests/FeedbackSubmittedTest.php index 651e16f..e81b05f 100644 --- a/lib/translator/tests/FeedbackSubmittedTest.php +++ b/lib/translator/tests/FeedbackSubmittedTest.php @@ -68,12 +68,12 @@ class FeedbackSubmittedTest extends ModuleViewedTest { } protected function assertAttempt($input, $output) { - $ext_key = 'http://lrs.learninglocker.net/define/extensions/moodle_feedback_attempt'; + $extKey = 'http://lrs.learninglocker.net/define/extensions/moodle_feedback_attempt'; $this->assertEquals($input->url, $output['attempt_url']); $this->assertEquals($input->name, $output['attempt_name']); $this->assertEquals(static::$xapiType.$input->type, $output['attempt_type']); $this->assertEquals($input, $output['attempt_ext']); - $this->assertEquals($ext_key, $output['attempt_ext_key']); + $this->assertEquals($extKey, $output['attempt_ext_key']); } } diff --git a/lib/translator/tests/ModuleViewedTest.php b/lib/translator/tests/ModuleViewedTest.php index 59d5e54..1f1ec61 100644 --- a/lib/translator/tests/ModuleViewedTest.php +++ b/lib/translator/tests/ModuleViewedTest.php @@ -33,12 +33,12 @@ class ModuleViewedTest extends CourseViewedTest { } private function assertModule($input, $output, $type) { - $ext_key = 'http://lrs.learninglocker.net/define/extensions/moodle_module'; + $extKey = 'http://lrs.learninglocker.net/define/extensions/moodle_module'; $this->assertEquals($input->url, $output[$type.'_url']); $this->assertEquals($input->name, $output[$type.'_name']); $this->assertEquals($input->intro, $output[$type.'_description']); $this->assertEquals(static::$xapiType.$input->type, $output[$type.'_type']); $this->assertEquals($input, $output[$type.'_ext']); - $this->assertEquals($ext_key, $output[$type.'_ext_key']); + $this->assertEquals($extKey, $output[$type.'_ext_key']); } } -- GitLab