refs #31: Move progress output into callback

OParl · Nov 24, 2017 · 8bfe132 · 8bfe132
1 parent fe687c9
commit 8bfe132
Showing 1 changed file with 13 additions and 22 deletions.
diff --git a/lib/Spec/Jobs/ValidatorRunJob.php b/lib/Spec/Jobs/ValidatorRunJob.php
@@ -25,11 +25,6 @@ class ValidatorRunJob extends Job
      */
     protected $canSaveData;
 
-    /**
-     * @var Log
-     */
-    protected $log;
-
     /**
      * ValidatorRunJob constructor.
      *
@@ -46,7 +41,6 @@ public function __construct($endpoint, $email, $canSaveData)
 
     public function handle(Log $log, Filesystem $fs)
     {
-        $this->log = $log;
         $log->info("Beginning Validation for {$this->endpoint}");
 
         $validatorRepo = new Repository($fs, 'oparl_validator', '');
@@ -63,21 +57,18 @@ public function handle(Log $log, Filesystem $fs)
         $log->debug("Validator command line: {$validator->getCommandLine()}");
         $log->debug('Validator Environment', $validator->getEnv());
 
-        $validator->run([&$this, 'handleProgress']);
-    }
-
-    public function handleProgress($type, $data)
-    {
-        switch ($type) {
-            case Process::OUT:
-                try {
-                    $this->log->info($data);
-                } catch (\Exception $e) {
-                }
-                break;
-            case Process::ERR:
-                $this->log->error($data);
-                break;
-        }
+        $validator->run(function ($type, $data) use ($log) {
+            switch ($type) {
+                case Process::OUT:
+                    try {
+                        $log->info($data);
+                    } catch (\Exception $e) {
+                    }
+                    break;
+                case Process::ERR:
+                    $log->error($data);
+                    break;
+            }
+        });
     }
 }