Fix syntax error when using readonly with dnf#9512

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.

Sign up for GitHub

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
iluuu1994 wants to merge 1 commit into from
Closed

Fix syntax error when using readonly with dnf #9512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions Zend/tests/gh9500.phpt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
--TEST--
Bug GH-9500: Disjunctive Normal Form Types - readonly property followed by (
--FILE--
<?php
class Dnf
{
var A|(B&C) $a;
var (B&C)|A $b;
private A|(B&C) $c;
private (B&C)|A $d;
static A|(B&C) $e;
static (B&C)|A $f;
private static A|(B&C) $g;
private static (B&C)|A $h;
readonly private A|(B&C) $i;
readonly private (B&C)|A $j;
readonly A|(B&C) $k;
readonly (B&C)|A $l;
private readonly A|(B&C) $m;
private readonly (B&C)|A $n;
}

@SpacePossumSpacePossumSep 16, 2022

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

<?phpclass A
{
readonlystatic (A&B)|C$b; // validstaticreadonly (A&B)|C$a; // invalid
}

these more simple static forms are not in the test, I haven't tested it on this PR, but just to let you know :)

?>
DONE
--EXPECT--
DONE
28 changes: 26 additions & 2 deletions Zend/tests/readonly_function.phpt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,34 @@ function readonly() {
echo "Hi!\n";
}

class A {
const readonly = 'Const hi!';

static function readonly() {
echo "Static hi!\n";
}
}

class B {
public $readonly = 'Prop hi!';

function readonly() {
echo "Instance hi!\n";
}
}

$b = new B();

readonly();
readonly ();

@GirgiasGirgiasSep 8, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does using readonly () with the whitespace now break? Or is it unnecessary due to the move to the parser?

@iluuu1994iluuu1994Sep 8, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just unnecessary since this is no longer special-cased. This should still work. I can keep it if you prefer.

@GirgiasGirgiasSep 8, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No harm keeping it then :)

echo A::readonly, "\n";
A::readonly();
$b->readonly();
echo $b->readonly, "\n";

?>
--EXPECT--
Hi!
Hi!
Const hi!
Static hi!
Instance hi!
Prop hi!
17 changes: 16 additions & 1 deletion Zend/zend_language_parser.y
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,6 +278,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
%type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
%type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
%type <ast> function_name

%type <num> returns_ref function fn is_reference is_variadic variable_modifiers
%type <num> method_modifiers non_empty_member_modifiers member_modifier
Expand DownExpand Up@@ -560,8 +561,17 @@ unset_variable:
variable { $$ = zend_ast_create(ZEND_AST_UNSET, $1); }
;

function_name:
T_STRING { $$ = $1; }
| T_READONLY {
zval zv;
if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
$$ = zend_ast_create_zval(&zv);
}
;

function_declaration_statement:
function returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type
function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type
backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
{ $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2 | $13, $1, $4,
zend_ast_get_str($3), $6, NULL, $11, $8, NULL); CG(extra_fn_flags) = $9; }
Expand DownExpand Up@@ -1270,6 +1280,11 @@ lexical_var:
function_call:
name argument_list
{ $$ = zend_ast_create(ZEND_AST_CALL, $1, $2); }
| T_READONLY argument_list {
zval zv;
if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
$$ = zend_ast_create(ZEND_AST_CALL, zend_ast_create_zval(&zv), $2);
}
| class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
{ $$ = zend_ast_create(ZEND_AST_STATIC_CALL, $1, $3, $4); }
| variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
Expand Down
6 changes: 0 additions & 6 deletions Zend/zend_language_scanner.l
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1729,12 +1729,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
RETURN_TOKEN_WITH_IDENT(T_READONLY);
}

/* Don't treat "readonly(" as a keyword, to allow using it as a function name. */
<ST_IN_SCRIPTING>"readonly"[ \n\r\t]*"(" {
yyless(strlen("readonly"));
RETURN_TOKEN_WITH_STR(T_STRING, 0);
}

<ST_IN_SCRIPTING>"unset" {
RETURN_TOKEN_WITH_IDENT(T_UNSET);
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix syntax error when using readonly with dnf#9512

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.

 Sign up for GitHub

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

iluuu1994
wants to merge
1
commit into

from

 Closed


Fix syntax error when using readonly with dnf
#9512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 25 additions & 0 deletions
Zend/tests/gh9500.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
--TEST--
Bug GH-9500: Disjunctive Normal Form Types - readonly property followed by (
--FILE--
<?php
class Dnf
{
 var A|(B&C) $a;
 var (B&C)|A $b;
 private A|(B&C) $c;
 private (B&C)|A $d;
 static A|(B&C) $e;
 static (B&C)|A $f;
 private static A|(B&C) $g;
 private static (B&C)|A $h;
 readonly private A|(B&C) $i;
 readonly private (B&C)|A $j;
 readonly A|(B&C) $k;
 readonly (B&C)|A $l;
 private readonly A|(B&C) $m;
 private readonly (B&C)|A $n;
}
@SpacePossumSpacePossumSep 16, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<?phpclass A
{
readonlystatic (A&B)|C$b; // validstaticreadonly (A&B)|C$a; // invalid
}
these more simple static forms are not in the test, I haven't tested it on this PR, but just to let you know :)
?>
DONE
--EXPECT--
DONE

28 changes: 26 additions & 2 deletions
Zend/tests/readonly_function.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,34 @@ function readonly() {
 echo "Hi!\n";
}

class A {
 const readonly = 'Const hi!';

 static function readonly() {
 echo "Static hi!\n";
 }
}

class B {
 public $readonly = 'Prop hi!';

 function readonly() {
 echo "Instance hi!\n";
 }
}

$b = new B();

readonly();
readonly ();
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does using readonly () with the whitespace now break? Or is it unnecessary due to the move to the parser?
@iluuu1994iluuu1994Sep 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just unnecessary since this is no longer special-cased. This should still work. I can keep it if you prefer.
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No harm keeping it then :)
echo A::readonly, "\n";
A::readonly();
$b->readonly();
echo $b->readonly, "\n";

?>
--EXPECT--
Hi!
Hi!
Const hi!
Static hi!
Instance hi!
Prop hi!

17 changes: 16 additions & 1 deletion
Zend/zend_language_parser.y

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,6 +278,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
%type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
%type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
%type <ast> function_name

%type <num> returns_ref function fn is_reference is_variadic variable_modifiers
%type <num> method_modifiers non_empty_member_modifiers member_modifier
Expand DownExpand Up@@ -560,8 +561,17 @@ unset_variable:
 variable { $$ = zend_ast_create(ZEND_AST_UNSET, $1); }
;

function_name:
 T_STRING { $$ = $1; }
	|	T_READONLY {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create_zval(&zv);
 }
;

function_declaration_statement:
	function returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type
	function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type
	backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 { $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2 | $13, $1, $4,
 zend_ast_get_str($3), $6, NULL, $11, $8, NULL); CG(extra_fn_flags) = $9; }
Expand DownExpand Up@@ -1270,6 +1280,11 @@ lexical_var:
function_call:
 name argument_list
 { $$ = zend_ast_create(ZEND_AST_CALL, $1, $2); }
	|	T_READONLY argument_list {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create(ZEND_AST_CALL, zend_ast_create_zval(&zv), $2);
 }
	|	class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
 { $$ = zend_ast_create(ZEND_AST_STATIC_CALL, $1, $3, $4); }
	|	variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
Expand Down

6 changes: 0 additions & 6 deletions
Zend/zend_language_scanner.l

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1729,12 +1729,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
	RETURN_TOKEN_WITH_IDENT(T_READONLY);
}

/* Don't treat "readonly(" as a keyword, to allow using it as a function name. */
<ST_IN_SCRIPTING>"readonly"[ \n\r\t]*"(" {
	yyless(strlen("readonly"));
	RETURN_TOKEN_WITH_STR(T_STRING, 0);
}

<ST_IN_SCRIPTING>"unset" {
	RETURN_TOKEN_WITH_IDENT(T_UNSET);
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix syntax error when using readonly with dnf#9512

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.

 Sign up for GitHub

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

iluuu1994
wants to merge
1
commit into

from

 Closed


Fix syntax error when using readonly with dnf
#9512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 25 additions & 0 deletions
Zend/tests/gh9500.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
--TEST--
Bug GH-9500: Disjunctive Normal Form Types - readonly property followed by (
--FILE--
<?php
class Dnf
{
 var A|(B&C) $a;
 var (B&C)|A $b;
 private A|(B&C) $c;
 private (B&C)|A $d;
 static A|(B&C) $e;
 static (B&C)|A $f;
 private static A|(B&C) $g;
 private static (B&C)|A $h;
 readonly private A|(B&C) $i;
 readonly private (B&C)|A $j;
 readonly A|(B&C) $k;
 readonly (B&C)|A $l;
 private readonly A|(B&C) $m;
 private readonly (B&C)|A $n;
}
@SpacePossumSpacePossumSep 16, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<?phpclass A
{
readonlystatic (A&B)|C$b; // validstaticreadonly (A&B)|C$a; // invalid
}
these more simple static forms are not in the test, I haven't tested it on this PR, but just to let you know :)
?>
DONE
--EXPECT--
DONE

28 changes: 26 additions & 2 deletions
Zend/tests/readonly_function.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,34 @@ function readonly() {
 echo "Hi!\n";
}

class A {
 const readonly = 'Const hi!';

 static function readonly() {
 echo "Static hi!\n";
 }
}

class B {
 public $readonly = 'Prop hi!';

 function readonly() {
 echo "Instance hi!\n";
 }
}

$b = new B();

readonly();
readonly ();
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does using readonly () with the whitespace now break? Or is it unnecessary due to the move to the parser?
@iluuu1994iluuu1994Sep 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just unnecessary since this is no longer special-cased. This should still work. I can keep it if you prefer.
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No harm keeping it then :)
echo A::readonly, "\n";
A::readonly();
$b->readonly();
echo $b->readonly, "\n";

?>
--EXPECT--
Hi!
Hi!
Const hi!
Static hi!
Instance hi!
Prop hi!

17 changes: 16 additions & 1 deletion
Zend/zend_language_parser.y

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,6 +278,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
%type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
%type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
%type <ast> function_name

%type <num> returns_ref function fn is_reference is_variadic variable_modifiers
%type <num> method_modifiers non_empty_member_modifiers member_modifier
Expand DownExpand Up@@ -560,8 +561,17 @@ unset_variable:
 variable { $$ = zend_ast_create(ZEND_AST_UNSET, $1); }
;

function_name:
 T_STRING { $$ = $1; }
	|	T_READONLY {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create_zval(&zv);
 }
;

function_declaration_statement:
	function returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type
	function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type
	backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 { $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2 | $13, $1, $4,
 zend_ast_get_str($3), $6, NULL, $11, $8, NULL); CG(extra_fn_flags) = $9; }
Expand DownExpand Up@@ -1270,6 +1280,11 @@ lexical_var:
function_call:
 name argument_list
 { $$ = zend_ast_create(ZEND_AST_CALL, $1, $2); }
	|	T_READONLY argument_list {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create(ZEND_AST_CALL, zend_ast_create_zval(&zv), $2);
 }
	|	class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
 { $$ = zend_ast_create(ZEND_AST_STATIC_CALL, $1, $3, $4); }
	|	variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
Expand Down

6 changes: 0 additions & 6 deletions
Zend/zend_language_scanner.l

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1729,12 +1729,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
	RETURN_TOKEN_WITH_IDENT(T_READONLY);
}

/* Don't treat "readonly(" as a keyword, to allow using it as a function name. */
<ST_IN_SCRIPTING>"readonly"[ \n\r\t]*"(" {
	yyless(strlen("readonly"));
	RETURN_TOKEN_WITH_STR(T_STRING, 0);
}

<ST_IN_SCRIPTING>"unset" {
	RETURN_TOKEN_WITH_IDENT(T_UNSET);
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix syntax error when using readonly with dnf#9512

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.

 Sign up for GitHub

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

iluuu1994
wants to merge
1
commit into

from

 Closed


Fix syntax error when using readonly with dnf
#9512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 25 additions & 0 deletions
Zend/tests/gh9500.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
--TEST--
Bug GH-9500: Disjunctive Normal Form Types - readonly property followed by (
--FILE--
<?php
class Dnf
{
 var A|(B&C) $a;
 var (B&C)|A $b;
 private A|(B&C) $c;
 private (B&C)|A $d;
 static A|(B&C) $e;
 static (B&C)|A $f;
 private static A|(B&C) $g;
 private static (B&C)|A $h;
 readonly private A|(B&C) $i;
 readonly private (B&C)|A $j;
 readonly A|(B&C) $k;
 readonly (B&C)|A $l;
 private readonly A|(B&C) $m;
 private readonly (B&C)|A $n;
}
@SpacePossumSpacePossumSep 16, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<?phpclass A
{
readonlystatic (A&B)|C$b; // validstaticreadonly (A&B)|C$a; // invalid
}
these more simple static forms are not in the test, I haven't tested it on this PR, but just to let you know :)
?>
DONE
--EXPECT--
DONE

28 changes: 26 additions & 2 deletions
Zend/tests/readonly_function.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,34 @@ function readonly() {
 echo "Hi!\n";
}

class A {
 const readonly = 'Const hi!';

 static function readonly() {
 echo "Static hi!\n";
 }
}

class B {
 public $readonly = 'Prop hi!';

 function readonly() {
 echo "Instance hi!\n";
 }
}

$b = new B();

readonly();
readonly ();
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does using readonly () with the whitespace now break? Or is it unnecessary due to the move to the parser?
@iluuu1994iluuu1994Sep 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just unnecessary since this is no longer special-cased. This should still work. I can keep it if you prefer.
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No harm keeping it then :)
echo A::readonly, "\n";
A::readonly();
$b->readonly();
echo $b->readonly, "\n";

?>
--EXPECT--
Hi!
Hi!
Const hi!
Static hi!
Instance hi!
Prop hi!

17 changes: 16 additions & 1 deletion
Zend/zend_language_parser.y

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,6 +278,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
%type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
%type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
%type <ast> function_name

%type <num> returns_ref function fn is_reference is_variadic variable_modifiers
%type <num> method_modifiers non_empty_member_modifiers member_modifier
Expand DownExpand Up@@ -560,8 +561,17 @@ unset_variable:
 variable { $$ = zend_ast_create(ZEND_AST_UNSET, $1); }
;

function_name:
 T_STRING { $$ = $1; }
	|	T_READONLY {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create_zval(&zv);
 }
;

function_declaration_statement:
	function returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type
	function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type
	backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 { $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2 | $13, $1, $4,
 zend_ast_get_str($3), $6, NULL, $11, $8, NULL); CG(extra_fn_flags) = $9; }
Expand DownExpand Up@@ -1270,6 +1280,11 @@ lexical_var:
function_call:
 name argument_list
 { $$ = zend_ast_create(ZEND_AST_CALL, $1, $2); }
	|	T_READONLY argument_list {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create(ZEND_AST_CALL, zend_ast_create_zval(&zv), $2);
 }
	|	class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
 { $$ = zend_ast_create(ZEND_AST_STATIC_CALL, $1, $3, $4); }
	|	variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
Expand Down

6 changes: 0 additions & 6 deletions
Zend/zend_language_scanner.l

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1729,12 +1729,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
	RETURN_TOKEN_WITH_IDENT(T_READONLY);
}

/* Don't treat "readonly(" as a keyword, to allow using it as a function name. */
<ST_IN_SCRIPTING>"readonly"[ \n\r\t]*"(" {
	yyless(strlen("readonly"));
	RETURN_TOKEN_WITH_STR(T_STRING, 0);
}

<ST_IN_SCRIPTING>"unset" {
	RETURN_TOKEN_WITH_IDENT(T_UNSET);
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix syntax error when using readonly with dnf#9512

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.

 Sign up for GitHub

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

iluuu1994
wants to merge
1
commit into

from

 Closed


Fix syntax error when using readonly with dnf
#9512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 25 additions & 0 deletions
Zend/tests/gh9500.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
--TEST--
Bug GH-9500: Disjunctive Normal Form Types - readonly property followed by (
--FILE--
<?php
class Dnf
{
 var A|(B&C) $a;
 var (B&C)|A $b;
 private A|(B&C) $c;
 private (B&C)|A $d;
 static A|(B&C) $e;
 static (B&C)|A $f;
 private static A|(B&C) $g;
 private static (B&C)|A $h;
 readonly private A|(B&C) $i;
 readonly private (B&C)|A $j;
 readonly A|(B&C) $k;
 readonly (B&C)|A $l;
 private readonly A|(B&C) $m;
 private readonly (B&C)|A $n;
}
@SpacePossumSpacePossumSep 16, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<?phpclass A
{
readonlystatic (A&B)|C$b; // validstaticreadonly (A&B)|C$a; // invalid
}
these more simple static forms are not in the test, I haven't tested it on this PR, but just to let you know :)
?>
DONE
--EXPECT--
DONE

28 changes: 26 additions & 2 deletions
Zend/tests/readonly_function.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,34 @@ function readonly() {
 echo "Hi!\n";
}

class A {
 const readonly = 'Const hi!';

 static function readonly() {
 echo "Static hi!\n";
 }
}

class B {
 public $readonly = 'Prop hi!';

 function readonly() {
 echo "Instance hi!\n";
 }
}

$b = new B();

readonly();
readonly ();
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does using readonly () with the whitespace now break? Or is it unnecessary due to the move to the parser?
@iluuu1994iluuu1994Sep 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just unnecessary since this is no longer special-cased. This should still work. I can keep it if you prefer.
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No harm keeping it then :)
echo A::readonly, "\n";
A::readonly();
$b->readonly();
echo $b->readonly, "\n";

?>
--EXPECT--
Hi!
Hi!
Const hi!
Static hi!
Instance hi!
Prop hi!

17 changes: 16 additions & 1 deletion
Zend/zend_language_parser.y

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,6 +278,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
%type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
%type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
%type <ast> function_name

%type <num> returns_ref function fn is_reference is_variadic variable_modifiers
%type <num> method_modifiers non_empty_member_modifiers member_modifier
Expand DownExpand Up@@ -560,8 +561,17 @@ unset_variable:
 variable { $$ = zend_ast_create(ZEND_AST_UNSET, $1); }
;

function_name:
 T_STRING { $$ = $1; }
	|	T_READONLY {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create_zval(&zv);
 }
;

function_declaration_statement:
	function returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type
	function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type
	backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 { $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2 | $13, $1, $4,
 zend_ast_get_str($3), $6, NULL, $11, $8, NULL); CG(extra_fn_flags) = $9; }
Expand DownExpand Up@@ -1270,6 +1280,11 @@ lexical_var:
function_call:
 name argument_list
 { $$ = zend_ast_create(ZEND_AST_CALL, $1, $2); }
	|	T_READONLY argument_list {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create(ZEND_AST_CALL, zend_ast_create_zval(&zv), $2);
 }
	|	class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
 { $$ = zend_ast_create(ZEND_AST_STATIC_CALL, $1, $3, $4); }
	|	variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
Expand Down

6 changes: 0 additions & 6 deletions
Zend/zend_language_scanner.l

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1729,12 +1729,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
	RETURN_TOKEN_WITH_IDENT(T_READONLY);
}

/* Don't treat "readonly(" as a keyword, to allow using it as a function name. */
<ST_IN_SCRIPTING>"readonly"[ \n\r\t]*"(" {
	yyless(strlen("readonly"));
	RETURN_TOKEN_WITH_STR(T_STRING, 0);
}

<ST_IN_SCRIPTING>"unset" {
	RETURN_TOKEN_WITH_IDENT(T_UNSET);
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix syntax error when using readonly with dnf#9512

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.

 Sign up for GitHub

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

iluuu1994
wants to merge
1
commit into

from

 Closed


Fix syntax error when using readonly with dnf
#9512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 25 additions & 0 deletions
Zend/tests/gh9500.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
--TEST--
Bug GH-9500: Disjunctive Normal Form Types - readonly property followed by (
--FILE--
<?php
class Dnf
{
 var A|(B&C) $a;
 var (B&C)|A $b;
 private A|(B&C) $c;
 private (B&C)|A $d;
 static A|(B&C) $e;
 static (B&C)|A $f;
 private static A|(B&C) $g;
 private static (B&C)|A $h;
 readonly private A|(B&C) $i;
 readonly private (B&C)|A $j;
 readonly A|(B&C) $k;
 readonly (B&C)|A $l;
 private readonly A|(B&C) $m;
 private readonly (B&C)|A $n;
}
@SpacePossumSpacePossumSep 16, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<?phpclass A
{
readonlystatic (A&B)|C$b; // validstaticreadonly (A&B)|C$a; // invalid
}
these more simple static forms are not in the test, I haven't tested it on this PR, but just to let you know :)
?>
DONE
--EXPECT--
DONE

28 changes: 26 additions & 2 deletions
Zend/tests/readonly_function.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,34 @@ function readonly() {
 echo "Hi!\n";
}

class A {
 const readonly = 'Const hi!';

 static function readonly() {
 echo "Static hi!\n";
 }
}

class B {
 public $readonly = 'Prop hi!';

 function readonly() {
 echo "Instance hi!\n";
 }
}

$b = new B();

readonly();
readonly ();
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does using readonly () with the whitespace now break? Or is it unnecessary due to the move to the parser?
@iluuu1994iluuu1994Sep 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just unnecessary since this is no longer special-cased. This should still work. I can keep it if you prefer.
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No harm keeping it then :)
echo A::readonly, "\n";
A::readonly();
$b->readonly();
echo $b->readonly, "\n";

?>
--EXPECT--
Hi!
Hi!
Const hi!
Static hi!
Instance hi!
Prop hi!

17 changes: 16 additions & 1 deletion
Zend/zend_language_parser.y

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,6 +278,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
%type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
%type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
%type <ast> function_name

%type <num> returns_ref function fn is_reference is_variadic variable_modifiers
%type <num> method_modifiers non_empty_member_modifiers member_modifier
Expand DownExpand Up@@ -560,8 +561,17 @@ unset_variable:
 variable { $$ = zend_ast_create(ZEND_AST_UNSET, $1); }
;

function_name:
 T_STRING { $$ = $1; }
	|	T_READONLY {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create_zval(&zv);
 }
;

function_declaration_statement:
	function returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type
	function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type
	backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 { $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2 | $13, $1, $4,
 zend_ast_get_str($3), $6, NULL, $11, $8, NULL); CG(extra_fn_flags) = $9; }
Expand DownExpand Up@@ -1270,6 +1280,11 @@ lexical_var:
function_call:
 name argument_list
 { $$ = zend_ast_create(ZEND_AST_CALL, $1, $2); }
	|	T_READONLY argument_list {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create(ZEND_AST_CALL, zend_ast_create_zval(&zv), $2);
 }
	|	class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
 { $$ = zend_ast_create(ZEND_AST_STATIC_CALL, $1, $3, $4); }
	|	variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
Expand Down

6 changes: 0 additions & 6 deletions
Zend/zend_language_scanner.l

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1729,12 +1729,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
	RETURN_TOKEN_WITH_IDENT(T_READONLY);
}

/* Don't treat "readonly(" as a keyword, to allow using it as a function name. */
<ST_IN_SCRIPTING>"readonly"[ \n\r\t]*"(" {
	yyless(strlen("readonly"));
	RETURN_TOKEN_WITH_STR(T_STRING, 0);
}

<ST_IN_SCRIPTING>"unset" {
	RETURN_TOKEN_WITH_IDENT(T_UNSET);
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix syntax error when using readonly with dnf#9512

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.

 Sign up for GitHub

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

iluuu1994
wants to merge
1
commit into

from

 Closed


Fix syntax error when using readonly with dnf
#9512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 25 additions & 0 deletions
Zend/tests/gh9500.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
--TEST--
Bug GH-9500: Disjunctive Normal Form Types - readonly property followed by (
--FILE--
<?php
class Dnf
{
 var A|(B&C) $a;
 var (B&C)|A $b;
 private A|(B&C) $c;
 private (B&C)|A $d;
 static A|(B&C) $e;
 static (B&C)|A $f;
 private static A|(B&C) $g;
 private static (B&C)|A $h;
 readonly private A|(B&C) $i;
 readonly private (B&C)|A $j;
 readonly A|(B&C) $k;
 readonly (B&C)|A $l;
 private readonly A|(B&C) $m;
 private readonly (B&C)|A $n;
}
@SpacePossumSpacePossumSep 16, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<?phpclass A
{
readonlystatic (A&B)|C$b; // validstaticreadonly (A&B)|C$a; // invalid
}
these more simple static forms are not in the test, I haven't tested it on this PR, but just to let you know :)
?>
DONE
--EXPECT--
DONE

28 changes: 26 additions & 2 deletions
Zend/tests/readonly_function.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,34 @@ function readonly() {
 echo "Hi!\n";
}

class A {
 const readonly = 'Const hi!';

 static function readonly() {
 echo "Static hi!\n";
 }
}

class B {
 public $readonly = 'Prop hi!';

 function readonly() {
 echo "Instance hi!\n";
 }
}

$b = new B();

readonly();
readonly ();
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does using readonly () with the whitespace now break? Or is it unnecessary due to the move to the parser?
@iluuu1994iluuu1994Sep 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just unnecessary since this is no longer special-cased. This should still work. I can keep it if you prefer.
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No harm keeping it then :)
echo A::readonly, "\n";
A::readonly();
$b->readonly();
echo $b->readonly, "\n";

?>
--EXPECT--
Hi!
Hi!
Const hi!
Static hi!
Instance hi!
Prop hi!

17 changes: 16 additions & 1 deletion
Zend/zend_language_parser.y

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,6 +278,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
%type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
%type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
%type <ast> function_name

%type <num> returns_ref function fn is_reference is_variadic variable_modifiers
%type <num> method_modifiers non_empty_member_modifiers member_modifier
Expand DownExpand Up@@ -560,8 +561,17 @@ unset_variable:
 variable { $$ = zend_ast_create(ZEND_AST_UNSET, $1); }
;

function_name:
 T_STRING { $$ = $1; }
	|	T_READONLY {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create_zval(&zv);
 }
;

function_declaration_statement:
	function returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type
	function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type
	backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 { $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2 | $13, $1, $4,
 zend_ast_get_str($3), $6, NULL, $11, $8, NULL); CG(extra_fn_flags) = $9; }
Expand DownExpand Up@@ -1270,6 +1280,11 @@ lexical_var:
function_call:
 name argument_list
 { $$ = zend_ast_create(ZEND_AST_CALL, $1, $2); }
	|	T_READONLY argument_list {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create(ZEND_AST_CALL, zend_ast_create_zval(&zv), $2);
 }
	|	class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
 { $$ = zend_ast_create(ZEND_AST_STATIC_CALL, $1, $3, $4); }
	|	variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
Expand Down

6 changes: 0 additions & 6 deletions
Zend/zend_language_scanner.l

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1729,12 +1729,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
	RETURN_TOKEN_WITH_IDENT(T_READONLY);
}

/* Don't treat "readonly(" as a keyword, to allow using it as a function name. */
<ST_IN_SCRIPTING>"readonly"[ \n\r\t]*"(" {
	yyless(strlen("readonly"));
	RETURN_TOKEN_WITH_STR(T_STRING, 0);
}

<ST_IN_SCRIPTING>"unset" {
	RETURN_TOKEN_WITH_IDENT(T_UNSET);
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix syntax error when using readonly with dnf#9512

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.

 Sign up for GitHub

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

iluuu1994
wants to merge
1
commit into

from

 Closed


Fix syntax error when using readonly with dnf
#9512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 25 additions & 0 deletions
Zend/tests/gh9500.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
--TEST--
Bug GH-9500: Disjunctive Normal Form Types - readonly property followed by (
--FILE--
<?php
class Dnf
{
 var A|(B&C) $a;
 var (B&C)|A $b;
 private A|(B&C) $c;
 private (B&C)|A $d;
 static A|(B&C) $e;
 static (B&C)|A $f;
 private static A|(B&C) $g;
 private static (B&C)|A $h;
 readonly private A|(B&C) $i;
 readonly private (B&C)|A $j;
 readonly A|(B&C) $k;
 readonly (B&C)|A $l;
 private readonly A|(B&C) $m;
 private readonly (B&C)|A $n;
}
@SpacePossumSpacePossumSep 16, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<?phpclass A
{
readonlystatic (A&B)|C$b; // validstaticreadonly (A&B)|C$a; // invalid
}
these more simple static forms are not in the test, I haven't tested it on this PR, but just to let you know :)
?>
DONE
--EXPECT--
DONE

28 changes: 26 additions & 2 deletions
Zend/tests/readonly_function.phpt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,34 @@ function readonly() {
 echo "Hi!\n";
}

class A {
 const readonly = 'Const hi!';

 static function readonly() {
 echo "Static hi!\n";
 }
}

class B {
 public $readonly = 'Prop hi!';

 function readonly() {
 echo "Instance hi!\n";
 }
}

$b = new B();

readonly();
readonly ();
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does using readonly () with the whitespace now break? Or is it unnecessary due to the move to the parser?
@iluuu1994iluuu1994Sep 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just unnecessary since this is no longer special-cased. This should still work. I can keep it if you prefer.
@GirgiasGirgiasSep 8, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No harm keeping it then :)
echo A::readonly, "\n";
A::readonly();
$b->readonly();
echo $b->readonly, "\n";

?>
--EXPECT--
Hi!
Hi!
Const hi!
Static hi!
Instance hi!
Prop hi!

17 changes: 16 additions & 1 deletion
Zend/zend_language_parser.y

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,6 +278,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
%type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
%type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
%type <ast> function_name

%type <num> returns_ref function fn is_reference is_variadic variable_modifiers
%type <num> method_modifiers non_empty_member_modifiers member_modifier
Expand DownExpand Up@@ -560,8 +561,17 @@ unset_variable:
 variable { $$ = zend_ast_create(ZEND_AST_UNSET, $1); }
;

function_name:
 T_STRING { $$ = $1; }
	|	T_READONLY {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create_zval(&zv);
 }
;

function_declaration_statement:
	function returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type
	function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type
	backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 { $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2 | $13, $1, $4,
 zend_ast_get_str($3), $6, NULL, $11, $8, NULL); CG(extra_fn_flags) = $9; }
Expand DownExpand Up@@ -1270,6 +1280,11 @@ lexical_var:
function_call:
 name argument_list
 { $$ = zend_ast_create(ZEND_AST_CALL, $1, $2); }
	|	T_READONLY argument_list {
 zval zv;
 if (zend_lex_tstring(&zv, $1) == FAILURE) { YYABORT; }
 $$ = zend_ast_create(ZEND_AST_CALL, zend_ast_create_zval(&zv), $2);
 }
	|	class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
 { $$ = zend_ast_create(ZEND_AST_STATIC_CALL, $1, $3, $4); }
	|	variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
Expand Down

6 changes: 0 additions & 6 deletions
Zend/zend_language_scanner.l

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1729,12 +1729,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
	RETURN_TOKEN_WITH_IDENT(T_READONLY);
}

/* Don't treat "readonly(" as a keyword, to allow using it as a function name. */
<ST_IN_SCRIPTING>"readonly"[ \n\r\t]*"(" {
	yyless(strlen("readonly"));
	RETURN_TOKEN_WITH_STR(T_STRING, 0);
}

<ST_IN_SCRIPTING>"unset" {
	RETURN_TOKEN_WITH_IDENT(T_UNSET);
}
Expand Down