Merge branch '3.x' (ad9c42b6) · Commits · afi / PHP-Parser · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

PHP-Parser
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

afi
PHP-Parser
Commits
ad9c42b6

Commit ad9c42b6 authored 7 years ago by

Nikita Popov

Downloads
- Plain Diff

Merge branch '3.x'

Conflicts:
	lib/PhpParser/Parser/Php5.php
	lib/PhpParser/Parser/Php7.php

parents c18bb277 08215e76

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 3 additions, 1 deletion

CHANGELOG.md
grammar/php5.y 2 additions, 2 deletions

grammar/php5.y
grammar/php7.y 2 additions, 2 deletions

grammar/php7.y
lib/PhpParser/Parser/Php5.php 464 additions, 449 deletions

lib/PhpParser/Parser/Php5.php
lib/PhpParser/Parser/Php7.php 414 additions, 410 deletions

lib/PhpParser/Parser/Php7.php
test/code/parser/stmt/switch.test 8 additions, 0 deletions

test/code/parser/stmt/switch.test
test/code/prettyPrinter/stmt/switch.test 2 additions, 0 deletions

test/code/prettyPrinter/stmt/switch.test

with 895 additions and 864 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment