91ffc7fcef
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked PHP-CS-Fixer config
2019-02-15 06:19:26 +01:00
3ea04337b7
minor #2842 Tweak PHP-CS-Fixer config (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Tweak PHP-CS-Fixer config
Commits
-------
98a15a89
2019-02-15 06:18:14 +01:00
98a15a8973
tweaked PHP-CS-Fixer config
2019-02-15 06:17:13 +01:00
3486de9e35
fixed CS
2019-02-15 06:06:19 +01:00
9b1ff6a90b
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
2019-02-15 06:05:53 +01:00
a8e7eacd46
minor #2841 Change PHP-CS config (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Change PHP-CS config
Commits
-------
add887d6
2019-02-15 06:04:38 +01:00
010cfaf48f
fixed CS
2019-02-15 06:02:12 +01:00
afdb54cc06
Merge branch '1.x' into 2.x
...
* 1.x:
prefixed some classes with a backslash
2019-02-15 05:55:16 +01:00
cfca482226
minor #2840 Cs fixes (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Cs fixes
Commits
-------
b8daa6c4
2019-02-15 05:53:51 +01:00
b8daa6c458
prefixed some classes with a backslash
2019-02-15 05:51:47 +01:00
add887d60c
fixed CS
2019-02-15 04:46:05 +01:00
19da8de66d
Merge branch '1.x' into 2.x
...
* 1.x:
simplified some phpdocs
2019-02-15 04:24:29 +01:00
3845d5247a
minor #2839 Simplify some phpdocs (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Simplify some phpdocs
Commits
-------
ceb3c93e
2019-02-15 04:22:20 +01:00
f2eb6afd66
Merge branch '1.x' into 2.x
...
* 1.x:
added some docs about the difference between the include tag and the include function
2019-02-15 04:22:01 +01:00
ceb3c93e28
simplified some phpdocs
2019-02-15 04:20:04 +01:00
18f9780c6b
minor #2834 Clarify the difference between the include function and tag (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Clarify the difference between the include function and tag
should close #2829
Commits
-------
2d902484
2019-02-15 04:03:34 +01:00
5e76342b40
minor #2838 Deprecate Parser::isReservedMacroName() (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Deprecate Parser::isReservedMacroName()
Commits
-------
85972a04
2019-02-15 03:42:12 +01:00
85972a040e
deprecated Parser::isReservedMacroName()
2019-02-15 03:39:46 +01:00
185a11d243
tweaked message
2019-02-15 03:34:39 +01:00
0ff6e75c5d
minor #2836 Tweak deprecations (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Tweak deprecations
Commits
-------
8488c7c2
2019-02-15 03:25:21 +01:00
8488c7c2a4
tweaked deprecations
2019-02-14 07:47:25 +01:00
7dff42e893
Merge branch '1.x' into 2.x
...
* 1.x:
fixed Travis config
2019-02-14 07:47:02 +01:00
4ea6ff4a55
minor #2837 Fix Travis config (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix Travis config
Commits
-------
325acd21
2019-02-14 07:45:28 +01:00
325acd2141
fixed Travis config
2019-02-14 07:43:01 +01:00
2d9024843f
added some docs about the difference between the include tag and the include function
2019-02-13 09:34:17 +01:00
de376081a1
Merge branch '1.x' into 2.x
...
* 1.x:
removed the <pre> tag in docblocks
remove duplicated directory separator
Fix typo
bumped version to 1.37.2-DEV
prepared the 1.37.1 release
backport tests
2019-02-12 08:57:33 +01:00
c88e944958
minor #2832 Remove the <pre> tag in docblocks (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Remove the <pre> tag in docblocks
closes #2831 and closes #2830
Commits
-------
dcf228e9
2019-02-12 08:52:58 +01:00
dcf228e91d
removed the <pre> tag in docblocks
2019-02-12 08:50:54 +01:00
d142b77ddb
bug #2825 remove duplicated directory separator (xabbuh)
...
This PR was merged into the 1.x branch.
Discussion
----------
remove duplicated directory separator
The $rootPath property is already initialized with a trailing directory
separator in the class constructor.
Commits
-------
edcbcc18
2019-02-04 17:41:01 +01:00
edcbcc18ad
remove duplicated directory separator
...
The $rootPath property is already initialized with a trailing directory
separator in the class constructor.
2019-02-04 13:03:18 +01:00
3d822167aa
minor #2816 Fix typo (Lesik)
...
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2816 ).
Discussion
----------
Fix typo
Commits
-------
e773c8fc
2019-01-15 08:54:13 +01:00
e773c8fc9c
Fix typo
2019-01-15 08:54:07 +01:00
3afb492c4d
minor #2815 Revert "minor #2809 Fixed 2.x tests (yceruto)" (xabbuh)
...
This PR was merged into the 1.x branch.
Discussion
----------
Revert "minor #2809 Fixed 2.x tests (yceruto)"
This reverts commit 59c26ae2113fd85beda4577a8b12
2019-01-14 16:13:59 +01:00
237c326c78
bumped version to 2.6.3-DEV
2019-01-14 16:01:20 +01:00
7d7342c8a4
prepared the 2.6.2 release
2019-01-14 16:00:48 +01:00
9544f7ef87
bumped version to 1.37.2-DEV
2019-01-14 16:00:04 +01:00
66be9366c7
prepared the 1.37.1 release
2019-01-14 15:59:29 +01:00
577a8b121f
backport tests
2019-01-14 15:57:41 +01:00
639b18712c
updated CHANGELOG
2019-01-14 15:00:25 +01:00
09942d107d
Merge branch '1.x' into 2.x
...
* 1.x:
updated CHANGELOG
fix key exists check for non ArrayObject objects
2019-01-14 14:58:25 +01:00
86acbefe5c
updated CHANGELOG
2019-01-14 14:57:13 +01:00
366a0fd34d
bug #2813 fix key exists check for non ArrayObject objects (xabbuh)
...
This PR was merged into the 1.x branch.
Discussion
----------
fix key exists check for non ArrayObject objects
fixes #2810
Commits
-------
6df989ba
2019-01-14 14:56:07 +01:00
6df989bafe
fix key exists check for non ArrayObject objects
2019-01-14 13:02:12 +01:00
0a166d01e0
Merge branch '1.x' into 2.x
...
* 1.x:
fixed logic in TemplateWrapper
bumped version to 1.37.1-DEV
prepared the 1.37.0 release
2019-01-14 11:44:10 +01:00
361d864178
fixed logic in TemplateWrapper
2019-01-14 10:42:01 +01:00
5d89657ee9
bumped version to 2.6.2-DEV
2019-01-14 09:24:12 +01:00
a06a6f3d14
prepared the 2.6.1 release
2019-01-14 09:23:05 +01:00
9f0ed3c39b
bumped version to 1.37.1-DEV
2019-01-14 09:21:52 +01:00
e48a7b32a4
prepared the 1.37.0 release
2019-01-14 09:20:10 +01:00
c0a8ba200d
added missing items in the CHANGELOG
2019-01-14 09:17:30 +01:00
Fabien Potencier
Christian Flothmann
Lesik