pradosoft / prado

framework/I18N/core/TCache_Lite.php

Switch Indentation +9 added lines, -9 removed lines

@@ -611,15 +611,15 @@
     function _hash($data, $controlType)
     {
         switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            $this->raiseError('Unknown controlType ! '.
-            '(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+        	case 'md5':
+            	return md5($data);
+        	case 'crc32':
+            	return sprintf('% 32d', crc32($data));
+        	case 'strlen':
+            	return sprintf('% 32d', strlen($data));
+        	default:
+            	$this->raiseError('Unknown controlType ! '.
+            	'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
         }
     }
 

framework/I18N/core/MessageSource_XLIFF.php

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
  * Get the MessageSource class file.
  */
 use DOMDocument;
-use DOMXPath;
 use Prado\Exceptions\TException;
 use Prado\Exceptions\TIOException;
 

framework/Util/TCallChain.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 
 namespace Prado\Util;
 use Prado\Collections\TList;
-use Prado\Collections\TListIterator;
 
 /**
  * TCallChain is a recursive event calling mechanism.  This class implements

framework/Web/THttpRequest.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
  */
 
 namespace Prado\Web;
-use Prado\Collections\TMapIterator;
 use Prado\Caching\TFileCacheDependency;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Exceptions\TInvalidDataValueException;

framework/Web/UI/TClientScriptManager.php

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 namespace Prado\Web\UI;
 use Prado\Prado;
 use Prado\TApplicationMode;
-use Prado\Exceptions\TInvalidDataValueException;
 use Prado\Exceptions\TInvalidOperationException;
 use Prado\Web\Javascripts\TJavaScript;
 use Prado\Web\UI\ActiveControls\ICallbackEventHandler;

framework/Web/UI/TPage.php

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 use Prado\Collections\TList;
 use Prado\Collections\TMap;
 use Prado\Collections\TStack;
-use Prado\Data\ActiveRecord\TActiveRecord;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Exceptions\THttpException;
 use Prado\Exceptions\TInvalidDataValueException;

framework/Vendor/PhpShell/PHP/Shell.php

Switch Indentation +403 added lines, -403 removed lines

@@ -172,118 +172,118 @@ 
                 $ignore = 0;
 
                 switch($token[0]) {
-                case T_WHITESPACE:
-                case T_OPEN_TAG:
-                case T_CLOSE_TAG:
-                    $ignore = 1;
-                    break;
-                case T_FOREACH:
-                case T_DO:
-                case T_WHILE:
-                case T_FOR:
-
-                case T_IF:
-                case T_RETURN:
-
-                case T_CLASS:
-                case T_FUNCTION:
-                case T_INTERFACE:
-
-                case T_PRINT:
-                case T_ECHO:
-
-                case T_COMMENT:
-                case T_UNSET:
-
-                case T_INCLUDE:
-                case T_REQUIRE:
-                case T_INCLUDE_ONCE:
-                case T_REQUIRE_ONCE:
-                case T_TRY:
-                case T_SWITCH:
-                case T_DEFAULT:
-                case T_CASE:
-                case T_BREAK:
-                case T_DOC_COMMENT:
-                    $need_return = 0;
-                    break;
-                case T_EMPTY:
-                case T_ISSET:
-                case T_EVAL:
-                case T_EXIT:
-
-                case T_VARIABLE:
-                case T_STRING:
-                case T_NEW:
-                case T_EXTENDS:
-                case T_IMPLEMENTS:
-                case T_OBJECT_OPERATOR:
-                case T_DOUBLE_COLON:
-                case T_INSTANCEOF:
-
-                case T_CATCH:
-                case T_THROW:
-
-                case T_ELSE:
-                case T_AS:
-                case T_LNUMBER:
-                case T_DNUMBER:
-                case T_CONSTANT_ENCAPSED_STRING:
-                case T_ENCAPSED_AND_WHITESPACE:
-                case T_CHARACTER:
-                case T_ARRAY:
-                case T_DOUBLE_ARROW:
-
-                case T_CONST:
-                case T_PUBLIC:
-                case T_PROTECTED:
-                case T_PRIVATE:
-                case T_ABSTRACT:
-                case T_STATIC:
-                case T_VAR:
-
-                case T_INC:
-                case T_DEC:
-                case T_SL:
-                case T_SL_EQUAL:
-                case T_SR:
-                case T_SR_EQUAL:
-
-                case T_IS_EQUAL:
-                case T_IS_IDENTICAL:
-                case T_IS_GREATER_OR_EQUAL:
-                case T_IS_SMALLER_OR_EQUAL:
-
-                case T_BOOLEAN_OR:
-                case T_LOGICAL_OR:
-                case T_BOOLEAN_AND:
-                case T_LOGICAL_AND:
-                case T_LOGICAL_XOR:
-                case T_MINUS_EQUAL:
-                case T_PLUS_EQUAL:
-                case T_MUL_EQUAL:
-                case T_DIV_EQUAL:
-                case T_MOD_EQUAL:
-                case T_XOR_EQUAL:
-                case T_AND_EQUAL:
-                case T_OR_EQUAL:
-
-                case T_FUNC_C:
-                case T_CLASS_C:
-                case T_LINE:
-                case T_FILE:
-
-                case T_BOOL_CAST:
-                case T_INT_CAST:
-                case T_STRING_CAST:
-
-                    /* just go on */
-                    break;
-                default:
-                    /* debug unknown tags*/
-                    error_log(sprintf("unknown tag: %d (%s): %s".PHP_EOL, $token[0], token_name($token[0]), $token[1]));
-
-                    break;
+                	case T_WHITESPACE:
+                	case T_OPEN_TAG:
+                	case T_CLOSE_TAG:
+                    	$ignore = 1;
+                    	break;
+                	case T_FOREACH:
+                	case T_DO:
+                	case T_WHILE:
+                	case T_FOR:
+
+                	case T_IF:
+                	case T_RETURN:
+
+                	case T_CLASS:
+                	case T_FUNCTION:
+                	case T_INTERFACE:
+
+                	case T_PRINT:
+                	case T_ECHO:
+
+                	case T_COMMENT:
+                	case T_UNSET:
+
+                	case T_INCLUDE:
+                	case T_REQUIRE:
+                	case T_INCLUDE_ONCE:
+                	case T_REQUIRE_ONCE:
+                	case T_TRY:
+                	case T_SWITCH:
+                	case T_DEFAULT:
+                	case T_CASE:
+                	case T_BREAK:
+                	case T_DOC_COMMENT:
+                    	$need_return = 0;
+                    	break;
+                	case T_EMPTY:
+                	case T_ISSET:
+                	case T_EVAL:
+                	case T_EXIT:
+
+                	case T_VARIABLE:
+                	case T_STRING:
+                	case T_NEW:
+                	case T_EXTENDS:
+                	case T_IMPLEMENTS:
+                	case T_OBJECT_OPERATOR:
+                	case T_DOUBLE_COLON:
+                	case T_INSTANCEOF:
+
+                	case T_CATCH:
+                	case T_THROW:
+
+                	case T_ELSE:
+                	case T_AS:
+                	case T_LNUMBER:
+                	case T_DNUMBER:
+                	case T_CONSTANT_ENCAPSED_STRING:
+                	case T_ENCAPSED_AND_WHITESPACE:
+                	case T_CHARACTER:
+                	case T_ARRAY:
+                	case T_DOUBLE_ARROW:
+
+                	case T_CONST:
+                	case T_PUBLIC:
+                	case T_PROTECTED:
+                	case T_PRIVATE:
+                	case T_ABSTRACT:
+                	case T_STATIC:
+                	case T_VAR:
+
+                	case T_INC:
+                	case T_DEC:
+                	case T_SL:
+                	case T_SL_EQUAL:
+                	case T_SR:
+                	case T_SR_EQUAL:
+
+                	case T_IS_EQUAL:
+                	case T_IS_IDENTICAL:
+                	case T_IS_GREATER_OR_EQUAL:
+                	case T_IS_SMALLER_OR_EQUAL:
+
+                	case T_BOOLEAN_OR:
+                	case T_LOGICAL_OR:
+                	case T_BOOLEAN_AND:
+                	case T_LOGICAL_AND:
+                	case T_LOGICAL_XOR:
+                	case T_MINUS_EQUAL:
+                	case T_PLUS_EQUAL:
+                	case T_MUL_EQUAL:
+                	case T_DIV_EQUAL:
+                	case T_MOD_EQUAL:
+                	case T_XOR_EQUAL:
+                	case T_AND_EQUAL:
+                	case T_OR_EQUAL:
+
+                	case T_FUNC_C:
+                	case T_CLASS_C:
+                	case T_LINE:
+                	case T_FILE:
+
+                	case T_BOOL_CAST:
+                	case T_INT_CAST:
+                	case T_STRING_CAST:
+
+                    	/* just go on */
+                    	break;
+                	default:
+                    	/* debug unknown tags*/
+                    	error_log(sprintf("unknown tag: %d (%s): %s".PHP_EOL, $token[0], token_name($token[0]), $token[1]));
+
+                    	break;
                 }
                 if (!$ignore) {
                     $eval .= $token[1]." ";
@@ -295,356 +295,356 @@ 
                 $last = count($ts) - 1;
 
                 switch ($token) {
-                case '(':
-                    /* walk backwards through the tokens */
-
-                    if ($last >= 4 &&
-                        $ts[$last - 1]['token'] == T_STRING &&
-                        $ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
-                        $ts[$last - 3]['token'] == ')' ) {
-                        /* func()->method()
+                	case '(':
+                    	/* walk backwards through the tokens */
+
+                    	if ($last >= 4 &&
+                        	$ts[$last - 1]['token'] == T_STRING &&
+                        	$ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
+                        	$ts[$last - 3]['token'] == ')' ) {
+                        	/* func()->method()
                         *
                         * we can't know what func() is return, so we can't
                         * say if the method() exists or not
                         *
                         */
-                    } else if ($last >= 3 &&
-                        $ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[0]['token'] != T_ABSTRACT && /* if we are not in a class definition */
-                        $ts[1]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[$last - 1]['token'] == T_STRING &&
-                        $ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
-                        $ts[$last - 3]['token'] == T_VARIABLE ) {
-
-                        /* $object->method( */
-
-                        /* catch (Exception $e) does not set $e in $GLOBALS[] */
-                        $in_catch = 0;
-
-                        foreach ($ts as $v) {
-                            if ($v['token'] == T_CATCH) {
-                                $in_catch = 1;
-                            }
-                        }
-
-                        if (!$in_catch) {
-                            /* $object has to exist and has to be a object */
-                            $objname = $ts[$last - 3]['value'];
-
-                            if (!isset($GLOBALS[ltrim($objname, '$')])) {
-                                throw new Exception(sprintf('Variable \'%s\' is not set', $objname));
-                            }
-                            $object = $GLOBALS[ltrim($objname, '$')];
-
-                            if (!is_object($object)) {
-                                throw new Exception(sprintf('Variable \'%s\' is not a class', $objname));
-                            }
-
-                            $method = $ts[$last - 1]['value'];
-
-                            /* obj */
+                    	} else if ($last >= 3 &&
+                        	$ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[0]['token'] != T_ABSTRACT && /* if we are not in a class definition */
+                        	$ts[1]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[$last - 1]['token'] == T_STRING &&
+                        	$ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
+                        	$ts[$last - 3]['token'] == T_VARIABLE ) {
+
+                        	/* $object->method( */
 
-                            if (!method_exists($object, $method)) {
-                                throw new Exception(sprintf("Variable %s (Class '%s') doesn't have a method named '%s'",
-                                    $objname, get_class($object), $method));
-                            }
-                        }
-                    } else if ($last >= 3 &&
-                        $ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[$last - 1]['token'] == T_VARIABLE &&
-                        $ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
-                        $ts[$last - 3]['token'] == T_VARIABLE ) {
+                        	/* catch (Exception $e) does not set $e in $GLOBALS[] */
+                        	$in_catch = 0;
 
-                        /* $object->$method( */
+                        	foreach ($ts as $v) {
+                            	if ($v['token'] == T_CATCH) {
+                                	$in_catch = 1;
+                            	}
+                        	}
 
-                        /* $object has to exist and has to be a object */
-                        $objname = $ts[$last - 3]['value'];
+                        	if (!$in_catch) {
+                            	/* $object has to exist and has to be a object */
+                            	$objname = $ts[$last - 3]['value'];
 
-                        if (!isset($GLOBALS[ltrim($objname, '$')])) {
-                            throw new Exception(sprintf('Variable \'%s\' is not set', $objname));
-                        }
-                        $object = $GLOBALS[ltrim($objname, '$')];
+                            	if (!isset($GLOBALS[ltrim($objname, '$')])) {
+                                	throw new Exception(sprintf('Variable \'%s\' is not set', $objname));
+                            	}
+                            	$object = $GLOBALS[ltrim($objname, '$')];
 
-                        if (!is_object($object)) {
-                            throw new Exception(sprintf('Variable \'%s\' is not a class', $objname));
-                        }
+                            	if (!is_object($object)) {
+                                	throw new Exception(sprintf('Variable \'%s\' is not a class', $objname));
+                            	}
 
-                        $methodname = $ts[$last - 1]['value'];
+                            	$method = $ts[$last - 1]['value'];
 
-                        if (!isset($GLOBALS[ltrim($methodname, '$')])) {
-                            throw new Exception(sprintf('Variable \'%s\' is not set', $methodname));
-                        }
-                        $method = $GLOBALS[ltrim($methodname, '$')];
+                            	/* obj */
 
-                        /* obj */
+                            	if (!method_exists($object, $method)) {
+                                	throw new Exception(sprintf("Variable %s (Class '%s') doesn't have a method named '%s'",
+                                    	$objname, get_class($object), $method));
+                            	}
+                        	}
+                    	} else if ($last >= 3 &&
+                        	$ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[$last - 1]['token'] == T_VARIABLE &&
+                        	$ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
+                        	$ts[$last - 3]['token'] == T_VARIABLE ) {
 
-                        if (!method_exists($object, $method)) {
-                            throw new Exception(sprintf("Variable %s (Class '%s') doesn't have a method named '%s'",
-                                $objname, get_class($object), $method));
-                        }
+                        	/* $object->$method( */
 
-                    } else if ($last >= 6 &&
-                        $ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[$last - 1]['token'] == T_STRING &&
-                        $ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
-                        $ts[$last - 3]['token'] == ']' &&
-                            /* might be anything as index */
-                        $ts[$last - 5]['token'] == '[' &&
-                        $ts[$last - 6]['token'] == T_VARIABLE ) {
+                        	/* $object has to exist and has to be a object */
+                        	$objname = $ts[$last - 3]['value'];
 
-                        /* $object[...]->method( */
+                        	if (!isset($GLOBALS[ltrim($objname, '$')])) {
+                            	throw new Exception(sprintf('Variable \'%s\' is not set', $objname));
+                        	}
+                        	$object = $GLOBALS[ltrim($objname, '$')];
 
-                        /* $object has to exist and has to be a object */
-                        $objname = $ts[$last - 6]['value'];
+                        	if (!is_object($object)) {
+                            	throw new Exception(sprintf('Variable \'%s\' is not a class', $objname));
+                        	}
 
-                        if (!isset($GLOBALS[ltrim($objname, '$')])) {
-                            throw new Exception(sprintf('Variable \'%s\' is not set', $objname));
-                        }
-                        $array = $GLOBALS[ltrim($objname, '$')];
+                        	$methodname = $ts[$last - 1]['value'];
 
-                        if (!is_array($array)) {
-                            throw new Exception(sprintf('Variable \'%s\' is not a array', $objname));
-                        }
+                        	if (!isset($GLOBALS[ltrim($methodname, '$')])) {
+                            	throw new Exception(sprintf('Variable \'%s\' is not set', $methodname));
+                        	}
+                        	$method = $GLOBALS[ltrim($methodname, '$')];
 
-                        $andx = $ts[$last - 4]['value'];
+                        	/* obj */
 
-                        if (!isset($array[$andx])) {
-                            throw new Exception(sprintf('%s[\'%s\'] is not set', $objname, $andx));
-                        }
+                        	if (!method_exists($object, $method)) {
+                            	throw new Exception(sprintf("Variable %s (Class '%s') doesn't have a method named '%s'",
+                                	$objname, get_class($object), $method));
+                        	}
 
-                        $object = $array[$andx];
+                    	} else if ($last >= 6 &&
+                        	$ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[$last - 1]['token'] == T_STRING &&
+                        	$ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
+                        	$ts[$last - 3]['token'] == ']' &&
+                            	/* might be anything as index */
+                        	$ts[$last - 5]['token'] == '[' &&
+                        	$ts[$last - 6]['token'] == T_VARIABLE ) {
 
-                        if (!is_object($object)) {
-                            throw new Exception(sprintf('Variable \'%s\' is not a class', $objname));
-                        }
+                        	/* $object[...]->method( */
 
-                        $method = $ts[$last - 1]['value'];
+                        	/* $object has to exist and has to be a object */
+                        	$objname = $ts[$last - 6]['value'];
 
-                        /* obj */
+                        	if (!isset($GLOBALS[ltrim($objname, '$')])) {
+                            	throw new Exception(sprintf('Variable \'%s\' is not set', $objname));
+                        	}
+                        	$array = $GLOBALS[ltrim($objname, '$')];
 
-                        if (!method_exists($object, $method)) {
-                            throw new Exception(sprintf("Variable %s (Class '%s') doesn't have a method named '%s'",
-                                $objname, get_class($object), $method));
-                        }
+                        	if (!is_array($array)) {
+                            	throw new Exception(sprintf('Variable \'%s\' is not a array', $objname));
+                        	}
 
-                    } else if ($last >= 3 &&
-                        $ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[$last - 1]['token'] == T_STRING &&
-                        $ts[$last - 2]['token'] == T_DOUBLE_COLON &&
-                        $ts[$last - 3]['token'] == T_STRING ) {
+                        	$andx = $ts[$last - 4]['value'];
 
-                        /* Class::method() */
+                        	if (!isset($array[$andx])) {
+                            	throw new Exception(sprintf('%s[\'%s\'] is not set', $objname, $andx));
+                        	}
 
-                        /* $object has to exist and has to be a object */
-                        $classname = $ts[$last - 3]['value'];
+                        	$object = $array[$andx];
 
-                        if (!class_exists($classname)) {
-                            throw new Exception(sprintf('Class \'%s\' doesn\'t exist', $classname));
-                        }
+                        	if (!is_object($object)) {
+                            	throw new Exception(sprintf('Variable \'%s\' is not a class', $objname));
+                        	}
 
-                        $method = $ts[$last - 1]['value'];
+                        	$method = $ts[$last - 1]['value'];
 
-                        if (!in_array($method, get_class_methods($classname))) {
-                            throw new Exception(sprintf("Class '%s' doesn't have a method named '%s'",
-                                $classname, $method));
-                        }
-                    } else if ($last >= 3 &&
-                        $ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[$last - 1]['token'] == T_VARIABLE &&
-                        $ts[$last - 2]['token'] == T_DOUBLE_COLON &&
-                        $ts[$last - 3]['token'] == T_STRING ) {
+                        	/* obj */
 
-                        /* $var::method() */
+                        	if (!method_exists($object, $method)) {
+                            	throw new Exception(sprintf("Variable %s (Class '%s') doesn't have a method named '%s'",
+                                	$objname, get_class($object), $method));
+                        	}
 
-                        /* $object has to exist and has to be a object */
-                        $classname = $ts[$last - 3]['value'];
+                    	} else if ($last >= 3 &&
+                        	$ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[$last - 1]['token'] == T_STRING &&
+                        	$ts[$last - 2]['token'] == T_DOUBLE_COLON &&
+                        	$ts[$last - 3]['token'] == T_STRING ) {
 
-                        if (!class_exists($classname)) {
-                            throw new Exception(sprintf('Class \'%s\' doesn\'t exist', $classname));
-                        }
+                        	/* Class::method() */
 
-                        $methodname = $ts[$last - 1]['value'];
+                        	/* $object has to exist and has to be a object */
+                        	$classname = $ts[$last - 3]['value'];
 
-                        if (!isset($GLOBALS[ltrim($methodname, '$')])) {
-                            throw new Exception(sprintf('Variable \'%s\' is not set', $methodname));
-                        }
-                        $method = $GLOBALS[ltrim($methodname, '$')];
+                        	if (!class_exists($classname)) {
+                            	throw new Exception(sprintf('Class \'%s\' doesn\'t exist', $classname));
+                        	}
 
-                        if (!in_array($method, get_class_methods($classname))) {
-                            throw new Exception(sprintf("Class '%s' doesn't have a method named '%s'",
-                                $classname, $method));
-                        }
+                        	$method = $ts[$last - 1]['value'];
 
-                    } else if ($last >= 2 &&
-                        $ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[$last - 1]['token'] == T_STRING &&
-                        $ts[$last - 2]['token'] == T_NEW ) {
+                        	if (!in_array($method, get_class_methods($classname))) {
+                            	throw new Exception(sprintf("Class '%s' doesn't have a method named '%s'",
+                                	$classname, $method));
+                        	}
+                    	} else if ($last >= 3 &&
+                        	$ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[$last - 1]['token'] == T_VARIABLE &&
+                        	$ts[$last - 2]['token'] == T_DOUBLE_COLON &&
+                        	$ts[$last - 3]['token'] == T_STRING ) {
 
-                        /* new Class() */
+                        	/* $var::method() */
 
-                        /* don't care about this in a class ... { ... } */
+                        	/* $object has to exist and has to be a object */
+                        	$classname = $ts[$last - 3]['value'];
 
-                        $classname = $ts[$last - 1]['value'];
+                        	if (!class_exists($classname)) {
+                            	throw new Exception(sprintf('Class \'%s\' doesn\'t exist', $classname));
+                        	}
 
-                        if (!class_exists($classname)) {
-                            throw new Exception(sprintf('Class \'%s\' doesn\'t exist', $classname));
-                        }
+                        	$methodname = $ts[$last - 1]['value'];
 
-                        $r = new ReflectionClass($classname);
+                        	if (!isset($GLOBALS[ltrim($methodname, '$')])) {
+                            	throw new Exception(sprintf('Variable \'%s\' is not set', $methodname));
+                        	}
+                        	$method = $GLOBALS[ltrim($methodname, '$')];
 
-                        if ($r->isAbstract()) {
-                            throw new Exception(sprintf("Can't instantiate abstract Class '%s'", $classname));
-                        }
+                        	if (!in_array($method, get_class_methods($classname))) {
+                            	throw new Exception(sprintf("Class '%s' doesn't have a method named '%s'",
+                                	$classname, $method));
+                        	}
 
-                        if (!$r->isInstantiable()) {
-                            throw new Exception(sprintf('Class \'%s\' can\'t be instantiated. Is the class abstract ?', $classname));
-                        }
+                    	} else if ($last >= 2 &&
+                        	$ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[$last - 1]['token'] == T_STRING &&
+                        	$ts[$last - 2]['token'] == T_NEW ) {
 
-                    } else if ($last >= 2 &&
-                        $ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[$last - 1]['token'] == T_STRING &&
-                        $ts[$last - 2]['token'] == T_FUNCTION ) {
+                        	/* new Class() */
 
-                        /* make sure we are not a in class definition */
+                        	/* don't care about this in a class ... { ... } */
 
-                        /* function a() */
+                        	$classname = $ts[$last - 1]['value'];
 
-                        $func = $ts[$last - 1]['value'];
+                        	if (!class_exists($classname)) {
+                            	throw new Exception(sprintf('Class \'%s\' doesn\'t exist', $classname));
+                        	}
 
-                        if (function_exists($func)) {
-                            throw new Exception(sprintf('Function \'%s\' is already defined', $func));
-                        }
-                    } else if ($last >= 4 &&
-                        $ts[0]['token'] == T_CLASS &&
-                        $ts[1]['token'] == T_STRING &&
-                        $ts[$last - 1]['token'] == T_STRING &&
-                        $ts[$last - 2]['token'] == T_FUNCTION ) {
+                        	$r = new ReflectionClass($classname);
 
-                        /* make sure we are not a in class definition */
+                        	if ($r->isAbstract()) {
+                            	throw new Exception(sprintf("Can't instantiate abstract Class '%s'", $classname));
+                        	}
 
-                        /* class a { .. function a() ... } */
+                        	if (!$r->isInstantiable()) {
+                            	throw new Exception(sprintf('Class \'%s\' can\'t be instantiated. Is the class abstract ?', $classname));
+                        	}
 
-                        $func = $ts[$last - 1]['value'];
-                        $classname = $ts[1]['value'];
+                    	} else if ($last >= 2 &&
+                        	$ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[$last - 1]['token'] == T_STRING &&
+                        	$ts[$last - 2]['token'] == T_FUNCTION ) {
 
-                        if (isset($methods[$func])) {
-                            throw new Exception(sprintf("Can't redeclare method '%s' in Class '%s'", $func, $classname));
-                        }
+                        	/* make sure we are not a in class definition */
 
-                        $methods[$func] = 1;
+                        	/* function a() */
 
-                    } else if ($last >= 1 &&
-                        $ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[0]['token'] != T_ABSTRACT && /* if we are not in a class definition */
-                        $ts[1]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[$last - 1]['token'] == T_STRING ) {
-                        /* func() */
-                        $funcname = $ts[$last - 1]['value'];
+                        	$func = $ts[$last - 1]['value'];
 
-                        if (!function_exists($funcname)) {
-                            throw new Exception(sprintf("Function %s() doesn't exist", $funcname));
-                        }
-                    } else if ($last >= 1 &&
-                        $ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[$last - 1]['token'] == T_VARIABLE ) {
+                        	if (function_exists($func)) {
+                            	throw new Exception(sprintf('Function \'%s\' is already defined', $func));
+                        	}
+                    	} else if ($last >= 4 &&
+                        	$ts[0]['token'] == T_CLASS &&
+                        	$ts[1]['token'] == T_STRING &&
+                        	$ts[$last - 1]['token'] == T_STRING &&
+                        	$ts[$last - 2]['token'] == T_FUNCTION ) {
 
-                        /* $object has to exist and has to be a object */
-                        $funcname = $ts[$last - 1]['value'];
-
-                        if (!isset($GLOBALS[ltrim($funcname, '$')])) {
-                            throw new Exception(sprintf('Variable \'%s\' is not set', $funcname));
-                        }
-                        $func = $GLOBALS[ltrim($funcname, '$')];
-
-                        if (!function_exists($func)) {
-                            throw new Exception(sprintf("Function %s() doesn't exist", $func));
-                        }
-
-                    }
-
-                    array_push($braces, $token);
-                    break;
-                case '{':
-                    $need_return = 0;
-
-                    if ($last >= 2 &&
-                        $ts[$last - 1]['token'] == T_STRING &&
-                        $ts[$last - 2]['token'] == T_CLASS ) {
-
-                        /* class name { */
-
-                        $classname = $ts[$last - 1]['value'];
-
-                        if (class_exists($classname, false)) {
-                            throw new Exception(sprintf("Class '%s' can't be redeclared", $classname));
-                        }
-                    } else if ($last >= 4 &&
-                        $ts[$last - 1]['token'] == T_STRING &&
-                        $ts[$last - 2]['token'] == T_EXTENDS &&
-                        $ts[$last - 3]['token'] == T_STRING &&
-                        $ts[$last - 4]['token'] == T_CLASS ) {
-
-                        /* class classname extends classname { */
-
-                        $classname = $ts[$last - 3]['value'];
-                        $extendsname = $ts[$last - 1]['value'];
-
-                        if (class_exists($classname, false)) {
-                            throw new Exception(sprintf("Class '%s' can't be redeclared",
-                                $classname));
-                        }
-                        if (!class_exists($extendsname, true)) {
-                            throw new Exception(sprintf("Can't extend '%s' ... from not existing Class '%s'",
-                                $classname, $extendsname));
-                        }
-                    } else if ($last >= 4 &&
-                        $ts[$last - 1]['token'] == T_STRING &&
-                        $ts[$last - 2]['token'] == T_IMPLEMENTS &&
-                        $ts[$last - 3]['token'] == T_STRING &&
-                        $ts[$last - 4]['token'] == T_CLASS ) {
-
-                        /* class name implements interface { */
-
-                        $classname = $ts[$last - 3]['value'];
-                        $implements = $ts[$last - 1]['value'];
-
-                        if (class_exists($classname, false)) {
-                            throw new Exception(sprintf("Class '%s' can't be redeclared",
-                                $classname));
-                        }
-                        if (!interface_exists($implements, false)) {
-                            throw new Exception(sprintf("Can't implement not existing Interface '%s' for Class '%s'",
-                                $implements, $classname));
-                        }
-                    }
-
-                    array_push($braces, $token);
-                    break;
-                case '}':
-                    $need_return = 0;
-                case ')':
-                    array_pop($braces);
-                    break;
-                case '[':
-                    if ($ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[0]['token'] != T_ABSTRACT && /* if we are not in a class definition */
-                        $ts[1]['token'] != T_CLASS && /* if we are not in a class definition */
-                        $ts[$last - 1]['token'] == T_VARIABLE) {
-                        /* $a[] only works on array and string */
-
-                        /* $object has to exist and has to be a object */
-                        $objname = $ts[$last - 1]['value'];
-
-                        if (!isset($GLOBALS[ltrim($objname, '$')])) {
-                            throw new Exception(sprintf('Variable \'%s\' is not set', $objname));
-                        }
-                        $obj = $GLOBALS[ltrim($objname, '$')];
-
-                        if (is_object($obj)) {
-                            throw new Exception(sprintf('Objects (%s) don\'t support array access operators', $objname));
-                        }
-                    }
-                    break;
+                        	/* make sure we are not a in class definition */
+
+                        	/* class a { .. function a() ... } */
+
+                        	$func = $ts[$last - 1]['value'];
+                        	$classname = $ts[1]['value'];
+
+                        	if (isset($methods[$func])) {
+                            	throw new Exception(sprintf("Can't redeclare method '%s' in Class '%s'", $func, $classname));
+                        	}
+
+                        	$methods[$func] = 1;
+
+                    	} else if ($last >= 1 &&
+                        	$ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[0]['token'] != T_ABSTRACT && /* if we are not in a class definition */
+                        	$ts[1]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[$last - 1]['token'] == T_STRING ) {
+                        	/* func() */
+                        	$funcname = $ts[$last - 1]['value'];
+
+                        	if (!function_exists($funcname)) {
+                            	throw new Exception(sprintf("Function %s() doesn't exist", $funcname));
+                        	}
+                    	} else if ($last >= 1 &&
+                        	$ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[$last - 1]['token'] == T_VARIABLE ) {
+
+                        	/* $object has to exist and has to be a object */
+                        	$funcname = $ts[$last - 1]['value'];
+
+                        	if (!isset($GLOBALS[ltrim($funcname, '$')])) {
+                            	throw new Exception(sprintf('Variable \'%s\' is not set', $funcname));
+                        	}
+                        	$func = $GLOBALS[ltrim($funcname, '$')];
+
+                        	if (!function_exists($func)) {
+                            	throw new Exception(sprintf("Function %s() doesn't exist", $func));
+                        	}
+
+                    	}
+
+                    	array_push($braces, $token);
+                    	break;
+                	case '{':
+                    	$need_return = 0;
+
+                    	if ($last >= 2 &&
+                        	$ts[$last - 1]['token'] == T_STRING &&
+                        	$ts[$last - 2]['token'] == T_CLASS ) {
+
+                        	/* class name { */
+
+                        	$classname = $ts[$last - 1]['value'];
+
+                        	if (class_exists($classname, false)) {
+                            	throw new Exception(sprintf("Class '%s' can't be redeclared", $classname));
+                        	}
+                    	} else if ($last >= 4 &&
+                        	$ts[$last - 1]['token'] == T_STRING &&
+                        	$ts[$last - 2]['token'] == T_EXTENDS &&
+                        	$ts[$last - 3]['token'] == T_STRING &&
+                        	$ts[$last - 4]['token'] == T_CLASS ) {
+
+                        	/* class classname extends classname { */
+
+                        	$classname = $ts[$last - 3]['value'];
+                        	$extendsname = $ts[$last - 1]['value'];
+
+                        	if (class_exists($classname, false)) {
+                            	throw new Exception(sprintf("Class '%s' can't be redeclared",
+                                	$classname));
+                        	}
+                        	if (!class_exists($extendsname, true)) {
+                            	throw new Exception(sprintf("Can't extend '%s' ... from not existing Class '%s'",
+                                	$classname, $extendsname));
+                        	}
+                    	} else if ($last >= 4 &&
+                        	$ts[$last - 1]['token'] == T_STRING &&
+                        	$ts[$last - 2]['token'] == T_IMPLEMENTS &&
+                        	$ts[$last - 3]['token'] == T_STRING &&
+                        	$ts[$last - 4]['token'] == T_CLASS ) {
+
+                        	/* class name implements interface { */
+
+                        	$classname = $ts[$last - 3]['value'];
+                        	$implements = $ts[$last - 1]['value'];
+
+                        	if (class_exists($classname, false)) {
+                            	throw new Exception(sprintf("Class '%s' can't be redeclared",
+                                	$classname));
+                        	}
+                        	if (!interface_exists($implements, false)) {
+                            	throw new Exception(sprintf("Can't implement not existing Interface '%s' for Class '%s'",
+                                	$implements, $classname));
+                        	}
+                    	}
+
+                    	array_push($braces, $token);
+                    	break;
+                	case '}':
+                    	$need_return = 0;
+                	case ')':
+                    	array_pop($braces);
+                    	break;
+                	case '[':
+                    	if ($ts[0]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[0]['token'] != T_ABSTRACT && /* if we are not in a class definition */
+                        	$ts[1]['token'] != T_CLASS && /* if we are not in a class definition */
+                        	$ts[$last - 1]['token'] == T_VARIABLE) {
+                        	/* $a[] only works on array and string */
+
+                        	/* $object has to exist and has to be a object */
+                        	$objname = $ts[$last - 1]['value'];
+
+                        	if (!isset($GLOBALS[ltrim($objname, '$')])) {
+                            	throw new Exception(sprintf('Variable \'%s\' is not set', $objname));
+                        	}
+                        	$obj = $GLOBALS[ltrim($objname, '$')];
+
+                        	if (is_object($obj)) {
+                            	throw new Exception(sprintf('Objects (%s) don\'t support array access operators', $objname));
+                        	}
+                    	}
+                    	break;
                 }
 
                 $eval .= $token;

framework/Vendor/PhpShell/PHP/Shell/Extensions/VerbosePrint.php

Switch Indentation +7 added lines, -7 removed lines

@@ -29,13 +29,13 @@
 
     public function optSetVerbose($key, $val) {
         switch($val) {
-        case "false":
-        case "on":
-        case "1":
-            $this->opt_verbose = true;
-        default:
-            $this->opt_verbose = false;
-            break;
+        	case "false":
+        	case "on":
+        	case "1":
+            	$this->opt_verbose = true;
+        	default:
+            	$this->opt_verbose = false;
+            	break;
         }
     }
 

framework/Vendor/PhpShell/PHP/Shell/Extensions/ExecutionTime.php

Switch Indentation +13 added lines, -13 removed lines

@@ -15,19 +15,19 @@
 
     public function optSetExecTime($key, $val) {
         switch ($val) {
-        case "enable":
-        case "1":
-        case "on":
-            $this->show_exectime = true;
-            break;
-        case "disable":
-        case "0":
-        case "off":
-            $this->show_exectime = false;
-            break;
-        default:
-            printf(":set %s failed, unknown value. Use :set %s = (on|off)", $key, $key);
-            break;
+        	case "enable":
+        	case "1":
+        	case "on":
+            	$this->show_exectime = true;
+            	break;
+        	case "disable":
+        	case "0":
+        	case "off":
+            	$this->show_exectime = false;
+            	break;
+        	default:
+            	printf(":set %s failed, unknown value. Use :set %s = (on|off)", $key, $key);
+            	break;
         }
     }