- Merged 2 of these, nuke one totally outdated and irrelevant.

# Quite likely most if not all of TODO is also replaced by some Wiki page. 
# If so, replace the file contents with URL to the correct place :)

3 files changed, 2 insertions, 94 deletions

diff --git a/TODO b/TODO
index c3c5fab8da..d3f4bf2bfa 100644
--- a/TODO
+++ b/TODO
@@ -11,7 +11,8 @@ Zend
     * Const'ify APIs. Right now, many functions leave parameters untouched,
       but don't declare those as const. This makes interaction with other
       interfaces difficult which pass const parameters to us.
-
+    * Look at making zend_constant value member be a zval* instead of zval. (Andi)
+    * Implement inheritance rules for type hints. (Marcus) 
 
 global
 ------
diff --git a/TODO-5.1 b/TODO-5.1
deleted file mode 100644
index d2690f6e3b..0000000000
--- a/TODO-5.1
+++ /dev/null
@@ -1,4 +0,0 @@
-Zend Engine
------------
-  - Look at making zend_constant value member be a zval* instead of zval. (Andi)
-  - Implement inheritance rules for type hints. (Marcus) 
diff --git a/TODO-PHP5 b/TODO-PHP5
deleted file mode 100644
index 1bb22e2bda..0000000000
--- a/TODO-PHP5
+++ /dev/null
@@ -1,89 +0,0 @@
-Component:      Zend Engine 2
-
-                Important stuff to finish: PPP members/PPP methods, 
-                support of overloaded extensions, possibly differentiate 
-                between class and namespace as discussed with Stig in 
-                Germany.
-Responsibility: Zeev, Andi, Stas
-Time frame:     Couple of months for first part and extensions will be
-                ongoing while PHP is being fixed.
-                Things to leave for later versions: Native aggregation
-                support, accessing static members via object and not class.
-
-
-Component:      Aggregation
-Responsibility: Andi, Stig?
-Time frame:     ?
-
-
-Component:      Redesign of API Versioning
-Responsibility: ?
-Time frame:     1 month
-
-
-Component:      Thread Safety
-                Identify the extensions that are not thread safe by design 
-                or due to dependant libraries and identify them as such. 
-                If possible try to resolve thread safety issue via code 
-                improvements (if php code or patches will be accepted by 
-                library maintainers).   For situations where thread safety 
-                cannot easily be acheived a flag in the extension API is 
-                set so PHP can identify non-thread safe extensions.  These 
-                extensions will not be loaded in a ZTS compiled binary 
-                (unless it is cli/cgi).
-
-Responsibility: ?
-Time frame:     ?
-
-
-Component:      SAPI
-                Environment variables defined in the CGI spec need to be 
-                verified in each SAPI module that they conform to the CGI 
-                spec correctly.  If they do not, the SAPI module needs to 
-                fix the variable prior to script execution.  Having this 
-                conformity will aid in having PHP scripts run correctly 
-                under different sapi modules.
-
-Responsibility: Shane Caraveo & each sapi module owner
-Timeframe:      ? (but shouldn't be much effort, most modules are probably ok)
-
-
-Component:      RPC Abstraction Layer
-                Porting java, com, dotnet, xmlrpc, corba, soap and python, srm
-                (are there more ?) to work with the new oo api and preferably
-                by using ext/rpc.
-Responsibility: Harald
-Time frame:     2 months (but i have to wait for a few engine features first)
-
-
-Component:      OO Extensions
-                Each OO extension has to be revised and rewritten to fit into
-                the new OO model. We should decide which extensions are a must
-                to have for the release and which can be ported by the maintainer
-                later as a separate pecl release.
-                A list of extensions to be extended that have to be investigated:
-                  * browscap
-                  * aggregate
-                  * all *sql extensions (*_fetch_object)
-                  * domxml (seems like christian is rewriting it anyways)
-                  * ming
-Responsibility: Harald (, extension maintainers)
-
-
-Component:      Abstract Data Types (ADT)
-Responsibility: Sterling, Harald
-Time frame:     ?
-
-
-Component:      Test Suite
-                Extending the test suite with atleast a test for every
-                function in an extension that doesn't require external
-                resources. Also developing an automated test thing which
-                cvs ups's, compiles and tests the build on a daily base on
-                as much platforms/extensions as possible.
-
-                The test suite will also be extended to support threaded
-                testing and testing for differing sapi modules (via http
-                calls or other methods).
-Reponsibility:  Derick (, extension maintainers)
-Time frame:     3 months