Changeset 379

Timestamp:

07/29/08 16:02:41 (5 months ago)

Author:

mrook

Message:

#255 - Add Phing startup time to builtin properties

Files:

• branches/2.3/classes/phing/Phing.php (modified) (13 diffs)

branches/2.3/classes/phing/Phing.php

@@ -128 +128 @@
-         */
-        private static $isLogFileUsed = false;
-
+
-        /**
-         * Array to hold original ini settings that Phing changes (and needs
@@ -152 +152 @@
-         */
-        public static function start($args, array $additionalUserProperties = null) {
-
+
-                try {
-                        $m = new Phing();
@@ -280 +280 @@
-                self::$definedProps = new Properties();
-                $this->searchForThis = null;
-
+
-                // 1) First handle any options which should always
-                // Note: The order in which these are executed is important (if multiple of these options are specified)
-
+
-                if (in_array('-help', $args) || in_array('-h', $args)) {
-                        $this->printUsage();
-                        return;
-                }
-
+
-                if (in_array('-version', $args) || in_array('-v', $args)) {
-                        $this->printVersion();
-                        return;
-                }
-
+
-                // 2) Next pull out stand-alone args.
-                // Note: The order in which these are executed is important (if multiple of these options are specified)
-
+
-                if (false !== ($key = array_search('-quiet', $args, true))) {
-                        self::$msgOutputLevel = Project::MSG_WARN;
-                        unset($args[$key]);
-                }
-
+
-                if (false !== ($key = array_search('-verbose', $args, true))) {
-                        self::$msgOutputLevel = Project::MSG_VERBOSE;
-                        unset($args[$key]);
-                }
-
+
-                if (false !== ($key = array_search('-debug', $args, true))) {
-                        self::$msgOutputLevel = Project::MSG_DEBUG;
-                        unset($args[$key]);
-                }
-
+
-                // 3) Finally, cycle through to parse remaining args
- 
+
-                $keys = array_keys($args); // Use keys and iterate to max(keys) since there may be some gaps
-                for($i=0, $max = max(array_keys($args)); $i <= $max; $i++) {
-
+
-                        if (!array_key_exists($i, $args)) {
-                                // skip this argument, since it must have been removed above.
-                                continue;
-                        }
-
+
-                        $arg = $args[$i];
-
+
-                        if ($arg == "-logfile") {
-                                try {
@@ -590 +590 @@
-                                throw new ConfigurationException($msg);
-                        }
-
+
-                        $listener = new $clz();
-
+
-                        if ($listener instanceof StreamRequiredBuildLogger) {
-                                throw new ConfigurationException("Unable to add " . $listenerClassname . " as a listener, since it requires explicit error/output streams. (You can specify it as a -logger.)");
@@ -697 +697 @@
-
-                        if (self::$phpErrorCapture) {
-
+
-                                self::$capturedPhpErrors[] = array('message' => $message, 'level' => $level, 'line' => $line, 'file' => $file);
-
-                        } else {
-
+
-                                $message = '[PHP Error] ' . $message;
-                                $message .= ' [line ' . $line . ' of ' . $file . ']';
@@ -949 +949 @@
-                $dotClassname = basename($dotPath);
-                $dotClassnamePos = strlen($dotPath) - strlen($dotClassname);
-
+
-                // 1- temporarily replace escaped '.' with another illegal char (#)
-                $tmp = str_replace('\.', '##', $dotClassname);
@@ -1055 +1055 @@
-                        }
-                } else {
- 
+
-                        // current file (Phing.php)
-                        $maybeHomeDir = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR  . '..');
- 
+
-                        if (file_exists($testPath)) {
-                                return $testPath;
@@ -1122 +1122 @@
-                self::setProperty('user.home', getenv('HOME'));
-                self::setProperty('application.startdir', getcwd());
+                self::setProperty('phing.startTime', gmdate('D, d M Y H:i:s', time()) . ' GMT');
-
-                // try to detect machine dependent information
@@ -1135 +1136 @@
-                        $sysInfo['version'] = php_uname('v');
-                }
-
+
-
-                self::setProperty("host.name", isset($sysInfo['nodename']) ? $sysInfo['nodename'] : "unknown");
@@ -1233 +1234 @@
-         */
-        private static function setIni() {
-
+
-                self::$origIniSettings['error_reporting'] = error_reporting(E_ALL);
-
- 
- 
+
+
+
-                // 2) it would mean something very strange to set it to a value less than time script
-                // has already been running, which would be the likely change.
-
+
-                set_time_limit(0);
-
+
-                self::$origIniSettings['magic_quotes_gpc'] = ini_set('magic_quotes_gpc', 'off');
-                self::$origIniSettings['short_open_tag'] = ini_set('short_open_tag', 'off');
@@ -1249 +1250 @@
-                self::$origIniSettings['allow_call_time_pass_reference'] = ini_set('allow_call_time_pass_reference', 'on');
-                self::$origIniSettings['track_errors'] = ini_set('track_errors', 1);
-
+
-                // should return memory limit in MB
-                $mem_limit = (int) ini_get('memory_limit');
@@ -1258 +1259 @@
-                }
-        }
-
+
-        /**
-         * Restores [most] PHP INI values to their pre-Phing state.
- 
+
-         * Currently the following settings are not restored:
-         *      - max_execution_time (because getting current time limit is not possible)
-         *  - memory_limit (which may have been increased by Phing)
- 
+
-         * @return void
-         */
@@ -1297 +1298 @@
-         * Sets up the Phing environment but does not initiate the build process.
-         * @return void
- 
+
-         */
-        public static function startup() {