|
@@ -18,7 +18,7 @@ discard block |
|
|
block discarded – undo |
|
18
|
18
|
|
|
19
|
19
|
|
|
20
|
20
|
|
|
21
|
|
- const VALID_PHP_FUNCTION_NAME_PATTERN = '#^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$#';
|
|
|
21
|
+ const VALID_PHP_FUNCTION_NAME_PATTERN = '#^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$#';
|
|
22
|
22
|
const CAN_NEVER_EVER_CHOOSE_THIS_AS_FUNCTION_NAME= "new";
|
|
23
|
23
|
const PLACEHOLDER_FOR_INTERNALS_CLASSES_OPTIONALS_PARAMETERS ="This is internal and thus sucks we must do something ClassShortcutDesigner";
|
|
24
|
24
|
private static $DIR=null;
|
|
@@ -151,17 +151,17 @@ discard block |
|
|
block discarded – undo |
|
151
|
151
|
return include_once($file);
|
|
152
|
152
|
}
|
|
153
|
153
|
|
|
154
|
|
- private static function GetTheRightExceptionMessage($fileExists,$name,$fullQualifiedClassname){
|
|
155
|
|
- if (!$fileExists) {
|
|
156
|
|
- if (strtolower($name)!=='new'&&preg_match(self::VALID_PHP_FUNCTION_NAME_PATTERN, $name)) {
|
|
157
|
|
- throw new \InvalidArgumentException('function '.$name.' passed as second Argument already exists.
|
|
|
154
|
+ private static function GetTheRightExceptionMessage($fileExists,$name,$fullQualifiedClassname){
|
|
|
155
|
+ if (!$fileExists) {
|
|
|
156
|
+ if (strtolower($name)!=='new'&&preg_match(self::VALID_PHP_FUNCTION_NAME_PATTERN, $name)) {
|
|
|
157
|
+ throw new \InvalidArgumentException('function '.$name.' passed as second Argument already exists.
|
|
158
|
158
|
Can\'t create a shortcut with the same name');
|
|
159
|
|
- } else {
|
|
160
|
|
- throw new \InvalidArgumentException('function '.$fullQualifiedClassname.' already exists and An alias has not been provided as Argument 2.
|
|
|
159
|
+ } else {
|
|
|
160
|
+ throw new \InvalidArgumentException('function '.$fullQualifiedClassname.' already exists and An alias has not been provided as Argument 2.
|
|
161
|
161
|
Can\'t create a shortcut function with this name');
|
|
162
|
|
- }
|
|
163
|
|
- }
|
|
164
|
|
- }
|
|
|
162
|
+ }
|
|
|
163
|
+ }
|
|
|
164
|
+ }
|
|
165
|
165
|
|
|
166
|
166
|
public static function setDir($dirname)
|
|
167
|
167
|
{
|
Please login to merge, or discard this patch.