Changeset 1953 for trunk/framework/prado-cli.php

Timestamp:

05/15/2007 08:54:57 PM (20 months ago)

Author:

wei

Message:

update phing simpletest task

Files:

• trunk/framework/prado-cli.php (modified) (8 diffs)

trunk/framework/prado-cli.php

@@ -1 @@
-#!/usr/bin/env php
 <?php
 
@@ -191 +190 @@
         {
                 $app_dir = realpath($directory.'/protected/');
-                if($app_dir !== false)
+                if($app_dir !== false && is_dir($app_dir))
                 {
                         if(Prado::getApplication()===null)
@@ -483 +482 @@
         {
                 $dir = realpath($args[1]);
-                if($dir !== false)
+                if($dir !== false && is_dir($dir))
                         $this->runUnitTests($dir,$args);
                 else
@@ -525 +524 @@
         {
                 $app_dir = realpath($dir.'/protected');
-                if($app_dir !== false)
+                if($app_dir !== false && is_dir($app_dir))
                         return $app_dir;
                 return realpath($dir.'/../protected');
@@ -533 +532 @@
         {
                 $test_dir = realpath($dir.'/unit');
-                if($test_dir !== false)
+                if($test_dir !== false && is_dir($test_dir))
                         return $test_dir;
                 return realpath($dir.'/tests/unit/');
@@ -615 +614 @@
                 if(is_dir($dir))
                         return realpath($dir);
-                if(false !== ($app_dir = realpath($dir.'/protected/')))
+                if(false !== ($app_dir = realpath($dir.'/protected/')) && is_dir($app_dir))
                         return $app_dir;
                 echo '** Unable to find directory "'.$dir."\".\n";
@@ -623 +622 @@
         protected function getXmlFile($app_dir)
         {
-                if(false !== ($xml = realpath($app_dir.'/application.xml')))
+                if(false !== ($xml = realpath($app_dir.'/application.xml')) && is_file($xml))
                         return $xml;
-                if(false !== ($xml = realpath($app_dir.'/protected/application.xml')))
+                if(false !== ($xml = realpath($app_dir.'/protected/application.xml')) && is_file($xml))
                         return $xml;
                 echo '** Unable to find application.xml in '.$app_dir."\n";
@@ -651 +650 @@
                                 return $namespace;
                 $file = Prado::getPathOfNamespace($namespace, ".php");
-                if($file !== null && false !== ($path = realpath(dirname($file))))
+                if($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path))
                 {
                         if(strpos($path, $app_dir)===0)