-
-
Notifications
You must be signed in to change notification settings - Fork 109
Change error-handling from exceptions to returning a boolean #383
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6b5f202
Change error handling to returning a boolean value
annexus254 391f327
Change error handling to returning a boolean value
annexus254 216c3b5
Merge remote-tracking branch 'refs/remotes/origin/master'
annexus254 5039584
Reverting unnecessary whitespace removals
annexus254 56884c4
Reverting unnecessary whitespace removals
annexus254 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -4,8 +4,6 @@ | |||||
|
|
||||||
| namespace PhpMyAdmin\SqlParser; | ||||||
|
|
||||||
| use PhpMyAdmin\SqlParser\Exceptions\LoaderException; | ||||||
|
|
||||||
| use function class_exists; | ||||||
| use function explode; | ||||||
| use function intval; | ||||||
|
|
@@ -374,7 +372,7 @@ public static function isKeyword($str, $isReserved = false) | |||||
| $str = strtoupper($str); | ||||||
|
|
||||||
| if (isset(static::$KEYWORDS[$str])) { | ||||||
| if ($isReserved && ! (static::$KEYWORDS[$str] & Token::FLAG_KEYWORD_RESERVED)) { | ||||||
| if ($isReserved && !(static::$KEYWORDS[$str] & Token::FLAG_KEYWORD_RESERVED)) { | ||||||
| return null; | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -396,7 +394,7 @@ public static function isKeyword($str, $isReserved = false) | |||||
| */ | ||||||
| public static function isOperator($str) | ||||||
| { | ||||||
| if (! isset(static::$OPERATORS[$str])) { | ||||||
| if (!isset(static::$OPERATORS[$str])) { | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| return null; | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -588,11 +586,9 @@ public static function isSeparator($str) | |||||
| * | ||||||
| * @param string $context name of the context or full class name that defines the context | ||||||
| * | ||||||
| * @return void | ||||||
| * | ||||||
| * @throws LoaderException if the specified context doesn't exist. | ||||||
| * @return bool true if the context was loaded, false otherwise | ||||||
| */ | ||||||
| public static function load($context = '') | ||||||
| public static function load($context = ''): bool | ||||||
| { | ||||||
| if (empty($context)) { | ||||||
| $context = self::$defaultContext; | ||||||
|
|
@@ -604,11 +600,13 @@ public static function load($context = '') | |||||
| } | ||||||
|
|
||||||
| if (! class_exists($context)) { | ||||||
| throw @new LoaderException('Specified context ("' . $context . '") does not exist.', $context); | ||||||
| return false; | ||||||
| } | ||||||
|
|
||||||
| self::$loadedContext = $context; | ||||||
| self::$KEYWORDS = $context::$KEYWORDS; | ||||||
|
|
||||||
| return true; | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
|
|
@@ -628,24 +626,22 @@ public static function loadClosest($context = '') | |||||
| { | ||||||
| $length = strlen($context); | ||||||
| for ($i = $length; $i > 0;) { | ||||||
| try { | ||||||
| /* Trying to load the new context */ | ||||||
| static::load($context); | ||||||
|
|
||||||
| /* Trying to load the new context */ | ||||||
| if (static::load($context)) { | ||||||
| return $context; | ||||||
| } catch (LoaderException $e) { | ||||||
| /* Replace last two non zero digits by zeroes */ | ||||||
| do { | ||||||
| $i -= 2; | ||||||
| $part = substr($context, $i, 2); | ||||||
| /* No more numeric parts to strip */ | ||||||
| if (! is_numeric($part)) { | ||||||
| break 2; | ||||||
| } | ||||||
| } while (intval($part) === 0 && $i > 0); | ||||||
|
|
||||||
| $context = substr($context, 0, $i) . '00' . substr($context, $i + 2); | ||||||
| } | ||||||
|
|
||||||
| /* Replace last two non zero digits by zeroes */ | ||||||
| do { | ||||||
| $i -= 2; | ||||||
| $part = substr($context, $i, 2); | ||||||
| /* No more numeric parts to strip */ | ||||||
| if (! is_numeric($part)) { | ||||||
| break 2; | ||||||
| } | ||||||
| } while (intval($part) === 0 && $i > 0); | ||||||
|
|
||||||
| $context = substr($context, 0, $i) . '00' . substr($context, $i + 2); | ||||||
| } | ||||||
|
|
||||||
| /* Fallback to loading at least matching engine */ | ||||||
|
|
@@ -815,7 +811,7 @@ public static function escape($str, $quote = '`') | |||||
| return $str; | ||||||
| } | ||||||
|
|
||||||
| if ((static::$MODE & self::SQL_MODE_NO_ENCLOSING_QUOTES) && (! static::isKeyword($str, true))) { | ||||||
| if ((static::$MODE & self::SQL_MODE_NO_ENCLOSING_QUOTES) && (!static::isKeyword($str, true))) { | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| return $str; | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.