Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nette/neon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.3.1
Choose a base ref
...
head repository: nette/neon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Nov 25, 2021

  1. 1
    Copy the full SHA
    9cd9ee2 View commit details
  2. Copy the full SHA
    53e7978 View commit details
  3. Copy the full SHA
    b195261 View commit details
  4. fixed tests

    dg committed Nov 25, 2021
    Copy the full SHA
    54b287d View commit details

Commits on Dec 12, 2021

  1. cs

    dg committed Dec 12, 2021
    Copy the full SHA
    0c0138e View commit details
  2. cs whitespace

    dg committed Dec 12, 2021
    Copy the full SHA
    219f4c2 View commit details
  3. cs nullable typehints

    dg committed Dec 12, 2021
    Copy the full SHA
    16e5624 View commit details

Commits on Mar 7, 2022

  1. constants are PascalCase

    dg committed Mar 7, 2022
    Copy the full SHA
    d899ece View commit details
  2. removed Token::$offset

    dg committed Mar 7, 2022
    Copy the full SHA
    ae04edd View commit details

Commits on Mar 10, 2022

  1. added Parser::injectPos()

    dg committed Mar 10, 2022
    Copy the full SHA
    d61c30d View commit details
  2. Copy the full SHA
    51fca28 View commit details
  3. Node: added $startLine & $endLine

    dg committed Mar 10, 2022
    Copy the full SHA
    0bc2132 View commit details
  4. Copy the full SHA
    997b071 View commit details
  5. Copy the full SHA
    f7e5415 View commit details
  6. Copy the full SHA
    44abd50 View commit details
  7. improved phpdoc

    dg committed Mar 10, 2022
    Copy the full SHA
    d3868db View commit details
  8. improved tests

    dg committed Mar 10, 2022
    Copy the full SHA
    0cf8118 View commit details
  9. Copy the full SHA
    22e384d View commit details

Commits on Sep 6, 2022

  1. support for PHP 8.2

    dg committed Sep 6, 2022
    Copy the full SHA
    aaaf5aa View commit details

Commits on Oct 13, 2022

  1. updated github workflow

    dg committed Oct 13, 2022
    Copy the full SHA
    8bf33ee View commit details

Commits on Jan 13, 2023

  1. updated .gitattributes

    dg committed Jan 13, 2023
    Copy the full SHA
    e75276d View commit details
  2. removed community health files

    dg committed Jan 13, 2023
    Copy the full SHA
    9623558 View commit details
  3. Neon::decodeFile() is atomic

    dg committed Jan 13, 2023
    Copy the full SHA
    da0a1e8 View commit details
  4. opened 3.4-dev

    dg committed Jan 13, 2023
    Copy the full SHA
    15cb03e View commit details
  5. requires PHP 8.0

    dg committed Jan 13, 2023
    Copy the full SHA
    af3e2e1 View commit details
  6. composer: updated dependencies

    dg committed Jan 13, 2023
    Copy the full SHA
    9dc7b84 View commit details
  7. coding style

    dg committed Jan 13, 2023
    Copy the full SHA
    778b662 View commit details
  8. added property typehints

    dg committed Jan 13, 2023
    Copy the full SHA
    3914f3d View commit details
  9. used promoted property

    dg committed Jan 13, 2023
    Copy the full SHA
    ad41785 View commit details
  10. added PHP 8 typehints

    dg committed Jan 13, 2023
    Copy the full SHA
    61d9122 View commit details
  11. used PHP 8 features

    dg committed Jan 13, 2023
    Copy the full SHA
    bb1c7d9 View commit details
  12. Copy the full SHA
    9118b54 View commit details
  13. deprecated Neon::BLOCK

    dg committed Jan 13, 2023
    Copy the full SHA
    682ad26 View commit details
  14. updated phpstan settings

    dg committed Jan 13, 2023
    Copy the full SHA
    b191a35 View commit details
  15. optimize Lexer performance (#65)

    JanTvrdik authored and dg committed Jan 13, 2023
    Copy the full SHA
    372d945 View commit details

Commits on Sep 26, 2023

  1. cs

    dg committed Sep 26, 2023
    Copy the full SHA
    b119f29 View commit details
  2. updated .gitattributes

    dg committed Sep 26, 2023
    Copy the full SHA
    6ac7022 View commit details
  3. support for PHP 8.3

    dg committed Sep 26, 2023
    Copy the full SHA
    8e746ec View commit details

Commits on Sep 27, 2023

  1. Copy the full SHA
    5715e17 View commit details
  2. Copy the full SHA
    457bfbf View commit details

Commits on Jun 18, 2024

  1. readme: added jumbo, improved

    dg committed Jun 18, 2024
    Copy the full SHA
    a30cdca View commit details
  2. test: updated

    dg committed Jun 18, 2024
    Copy the full SHA
    dad6890 View commit details

Commits on Jun 26, 2024

  1. Copy the full SHA
    b2b28ae View commit details
  2. Copy the full SHA
    0d31534 View commit details
  3. github actions updated

    dg committed Jun 26, 2024
    Copy the full SHA
    c8481c1 View commit details
  4. support for PHP 8.4

    dg committed Jun 26, 2024
    Copy the full SHA
    8a7df4e View commit details

Commits on Oct 4, 2024

  1. Encoder: fixed encoding of control characters [Closes #72]

    ondrejmirtes authored and dg committed Oct 4, 2024
    Copy the full SHA
    3411aa8 View commit details

Commits on Jan 16, 2025

  1. cs

    dg committed Jan 16, 2025
    Copy the full SHA
    512d2ee View commit details
  2. opened 3.5-dev

    dg committed Jan 16, 2025
    Copy the full SHA
    1e990ce View commit details
  3. tests: matchFile() changed to same()

    too large files may overflow PREG
    dg committed Jan 16, 2025
    Copy the full SHA
    e4c5cf4 View commit details
Showing with 2,768 additions and 1,274 deletions.
  1. +2 −3 .gitattributes
  2. +0 −19 .github/ISSUE_TEMPLATE/Bug_report.md
  3. +0 −9 .github/ISSUE_TEMPLATE/Feature_request.md
  4. +0 −12 .github/ISSUE_TEMPLATE/Support_question.md
  5. +0 −21 .github/ISSUE_TEMPLATE/Support_us.md
  6. +0 −2 .github/funding.yml
  7. +0 −11 .github/pull_request_template.md
  8. +5 −5 .github/workflows/coding-style.yml
  9. +2 −2 .github/workflows/static-analysis.yml
  10. +5 −5 .github/workflows/tests.yml
  11. +5 −5 composer.json
  12. +0 −33 contributing.md
  13. +41 −0 phpstan-baseline.neon
  14. +4 −1 phpstan.neon
  15. +43 −12 readme.md
  16. +3 −4 src/Neon/Decoder.php
  17. +23 −13 src/Neon/Encoder.php
  18. +6 −11 src/Neon/Entity.php
  19. +9 −0 src/Neon/Exception.php
  20. +52 −40 src/Neon/Lexer.php
  21. +16 −11 src/Neon/Neon.php
  22. +12 −12 src/Neon/Node.php
  23. +19 −19 src/Neon/Node/ArrayItemNode.php
  24. +5 −32 src/Neon/Node/ArrayNode.php
  25. +31 −0 src/Neon/Node/BlockArrayNode.php
  26. +9 −15 src/Neon/Node/EntityChainNode.php
  27. +10 −18 src/Neon/Node/EntityNode.php
  28. +28 −0 src/Neon/Node/InlineArrayNode.php
  29. +52 −33 src/Neon/Node/LiteralNode.php
  30. +35 −32 src/Neon/Node/StringNode.php
  31. +105 −74 src/Neon/Parser.php
  32. +27 −0 src/Neon/Position.php
  33. +17 −19 src/Neon/Token.php
  34. +34 −40 src/Neon/TokenStream.php
  35. +51 −8 src/Neon/Traverser.php
  36. +303 −180 tests/Neon/Decoder.array.phpt
  37. +0 −24 tests/Neon/Decoder.deprecated.phpt
  38. +66 −0 tests/Neon/Decoder.entity.phpt
  39. +135 −90 tests/Neon/Decoder.errors.phpt
  40. +40 −78 tests/Neon/Decoder.inline.array.phpt
  41. +115 −81 tests/Neon/Decoder.multiline.phpt
  42. +24 −24 tests/Neon/Decoder.phpt
  43. +8 −6 tests/Neon/Decoder.var_export.phpt
  44. +4 −6 tests/Neon/Encoder.nodes.phpt
  45. +70 −38 tests/Neon/Encoder.phpt
  46. +6 −4 tests/Neon/Neon.decodeFile.phpt
  47. +43 −27 tests/Neon/Parser.nodes.phpt
  48. +6 −6 tests/Neon/Traverser.alter.phpt
  49. +93 −0 tests/Neon/Traverser.order.phpt
  50. +7 −5 tests/Neon/Traverser.phpt
  51. +244 −116 tests/Neon/fixtures/Encoder.nodes.txt
  52. +30 −0 tests/Neon/fixtures/Parser.nodes.neon
  53. +922 −67 tests/Neon/fixtures/Parser.nodes.txt
  54. +1 −1 tests/bootstrap.php
5 changes: 2 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
.gitattributes export-ignore
.gitignore export-ignore
.github export-ignore
.travis.yml export-ignore
ecs.php export-ignore
phpstan.neon export-ignore
ncs.* export-ignore
phpstan*.neon export-ignore
tests/ export-ignore

*.sh eol=lf
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/Bug_report.md

This file was deleted.

9 changes: 0 additions & 9 deletions .github/ISSUE_TEMPLATE/Feature_request.md

This file was deleted.

12 changes: 0 additions & 12 deletions .github/ISSUE_TEMPLATE/Support_question.md

This file was deleted.

21 changes: 0 additions & 21 deletions .github/ISSUE_TEMPLATE/Support_us.md

This file was deleted.

2 changes: 0 additions & 2 deletions .github/funding.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .github/pull_request_template.md

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/coding-style.yml
Original file line number Diff line number Diff line change
@@ -7,24 +7,24 @@ jobs:
name: Nette Code Checker
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: 7.1
php-version: 8.0
coverage: none

- run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress
- run: php temp/code-checker/code-checker --strict-types --no-progress
- run: php temp/code-checker/code-checker --strict-types --no-progress --ignore "tests/*/fixtures"


nette_cs:
name: Nette Coding Standard
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0
coverage: none

- run: composer create-project nette/coding-standard temp/coding-standard ^3 --no-progress
4 changes: 2 additions & 2 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@ jobs:
name: PHPStan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0
coverage: none

- run: composer install --no-progress --prefer-dist
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
php: ['8.0', '8.1', '8.2', '8.3', '8.4']

fail-fast: false

name: PHP ${{ matrix.php }} tests
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
@@ -23,7 +23,7 @@ jobs:
- run: composer install --no-progress --prefer-dist
- run: vendor/bin/tester tests -s -C
- if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: output
path: tests/**/output
@@ -33,10 +33,10 @@ jobs:
name: Code Coverage
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0
extensions: json, iconv
coverage: none

10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@
}
],
"require": {
"php": ">=7.1",
"php": "8.0 - 8.4",
"ext-json": "*"
},
"require-dev": {
"nette/tester": "^2.0",
"tracy/tracy": "^2.8.8",
"phpstan/phpstan": "^0.12"
"nette/tester": "^2.4",
"tracy/tracy": "^2.7",
"phpstan/phpstan": "^1.0"
},
"autoload": {
"classmap": ["src/"]
@@ -34,7 +34,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "3.3-dev"
"dev-master": "3.5-dev"
}
}
}
33 changes: 0 additions & 33 deletions contributing.md

This file was deleted.

41 changes: 41 additions & 0 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
parameters:
ignoreErrors:
-
message: '#^Property Nette\\Neon\\Node\\EntityChainNode\:\:\$chain \(array\<Nette\\Neon\\Node\\EntityNode\>\) does not accept array\<Nette\\Neon\\Node\>\.$#'
count: 1
path: src/Neon/Encoder.php

-
message: '#^Unreachable statement \- code above always terminates\.$#'
count: 1
path: src/Neon/Node.php

-
message: '#^If condition is always true\.$#'
count: 1
path: src/Neon/Parser.php

-
message: '#^Left side of && is always true\.$#'
count: 1
path: src/Neon/Parser.php

-
message: '#^Parameter \#1 \$chain of class Nette\\Neon\\Node\\EntityChainNode constructor expects array\<Nette\\Neon\\Node\\EntityNode\>, array\<int, Nette\\Neon\\Node\> given\.$#'
count: 1
path: src/Neon/Parser.php

-
message: '#^Unreachable statement \- code above always terminates\.$#'
count: 1
path: src/Neon/Parser.php

-
message: '#^While loop condition is always false\.$#'
count: 2
path: src/Neon/Parser.php

-
message: '#^While loop condition is always true\.$#'
count: 1
path: src/Neon/Parser.php
5 changes: 4 additions & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
includes:
- phpstan-baseline.neon

parameters:
level: 5
level: 6

paths:
- src
Loading