From cb2c9f9755103a4e672f05bf481059877cf021be Mon Sep 17 00:00:00 2001
From: Tudor Brindus <xyene@dmoj.ca>
Date: Sat, 9 Dec 2017 03:50:01 -0500
Subject: [PATCH] Drop dual PHP/PHP7 executors as per #117

---
 dmoj/executors/PHP.py          | 14 +++++++++++---
 dmoj/executors/PHP7.py         |  7 -------
 dmoj/executors/php_executor.py | 15 ---------------
 3 files changed, 11 insertions(+), 25 deletions(-)
 delete mode 100644 dmoj/executors/PHP7.py
 delete mode 100644 dmoj/executors/php_executor.py

diff --git a/dmoj/executors/PHP.py b/dmoj/executors/PHP.py
index c32fadef3..2582d406c 100644
--- 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
deleted file mode 100644
index 687204829..000000000
--- a/dmoj/executors/PHP7.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from .php_executor import PHPExecutor
-
-
-class Executor(PHPExecutor):
-    name = 'PHP7'
-    command = 'php7'
-    fs = ['.*\.ini$']
diff --git a/dmoj/executors/php_executor.py b/dmoj/executors/php_executor.py
deleted file mode 100644
index be0130b58..000000000
--- a/dmoj/executors/php_executor.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from .base_executor import ScriptExecutor
-
-
-class PHPExecutor(ScriptExecutor):
-    ext = '.php'
-    address_grace = 131072
-    test_program = '<?php while($f = fgets(STDIN)) echo $f;'
-
-    fs = ['.*/php[\w-]*\.ini$', '.*/conf.d/.*\.ini$']
-
-    def get_cmdline(self):
-        return ['php', self._code]
-
-    def get_fs(self):
-        return super(PHPExecutor, self).get_fs() + [self._code]