Drop dual PHP/PHP7 executors as per #117

DMOJ · Dec 9, 2017 · cb2c9f9 · quantum5 · Dec 9, 2017 · Xyene
1 parent 5686f91
commit cb2c9f9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 25 deletions.
diff --git a/dmoj/executors/PHP.py b/dmoj/executors/PHP.py
@@ -1,7 +1,15 @@
-from .php_executor import PHPExecutor
+from dmoj.executors.base_executor import ScriptExecutor
 
 
-class Executor(PHPExecutor):
+class Executor(ScriptExecutor):
     name = 'PHP'
+    ext = '.php'
     command = 'php'
-    command_paths = ['php5', 'php']
+    command_paths = ['php7', 'php5', 'php']
+
+    fs = ['.*/php[\w-]*\.ini$', '.*/conf.d/.*\.ini$']
+
+    test_program = '<?php while($f = fgets(STDIN)) echo $f;'
+
+    def get_cmdline(self):
+        return ['php', self._code]
diff --git a/dmoj/executors/PHP7.py b/dmoj/executors/PHP7.py
diff --git a/dmoj/executors/php_executor.py b/dmoj/executors/php_executor.py