Commit Graph

4099 Commits

Author SHA1 Message Date
Fabien Potencier 5d596fa455 Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
2019-02-17 11:05:01 +01:00
Fabien Potencier e7e1a71bd5 fixed CS 2019-02-17 11:04:35 +01:00
Fabien Potencier 90d579e433 moved most FQCN to use statements 2019-02-17 11:01:18 +01:00
Fabien Potencier 4f0876ea13 Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
  moved most FQCN to use statements
  prepared use statements
2019-02-17 10:55:19 +01:00
Fabien Potencier e9919c2187 fixed CS 2019-02-17 10:53:37 +01:00
Fabien Potencier de61216493 prepared use statements 2019-02-17 10:48:17 +01:00
Fabien Potencier 1e9c84adef minor #2848 Use statements everywhere (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2848).

Discussion
----------

Use statements everywhere

Commits
-------

1ddb8253 moved most FQCN to use statements
c92feb6a prepared use statements
2019-02-17 10:43:43 +01:00
Fabien Potencier 1ddb825336 moved most FQCN to use statements 2019-02-17 10:37:46 +01:00
Fabien Potencier c92feb6ab9 prepared use statements 2019-02-17 10:31:45 +01:00
Fabien Potencier 43fc1a8397 feature #2847 Deprecate the possibility to change the base template for generated templates (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Deprecate the possibility to change the base template for generated templates

Generated templates should be opaque and an implementation detail.

Commits
-------

3f71217f deprecated the possibility to change the base template for generated templates
2019-02-17 09:41:10 +01:00
Fabien Potencier 3f71217f63 deprecated the possibility to change the base template for generated templates 2019-02-17 09:39:54 +01:00
Fabien Potencier e37d86fca9 minor #2846 Use ::class whenever possible (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Use ::class whenever possible

Commits
-------

725f9423 used ::class whenever possible
2019-02-16 19:24:46 +01:00
Fabien Potencier 725f94233a used ::class whenever possible 2019-02-16 19:20:58 +01:00
Fabien Potencier bcba477953 minor #2845 Move some more classes to namespaced ones (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Move some more classes to namespaced ones

Commits
-------

69f37c16 moved some more classes to namespaced ones
2019-02-16 19:20:09 +01:00
Fabien Potencier 69f37c164b moved some more classes to namespaced ones 2019-02-16 19:13:57 +01:00
Fabien Potencier b4eae7c197 moved to namespaced classes by default 2019-02-15 08:48:39 +01:00
Fabien Potencier d1596b6ccf moved to namespaced classes by default 2019-02-15 08:44:47 +01:00
Fabien Potencier ff77e221e0 Merge branch '1.x' into 2.x
* 1.x:
  moved to namespaced classes by default
  fixed some class names
  bumped version to 1.38
2019-02-15 08:34:23 +01:00
Fabien Potencier 210fb60a0d feature #2844 Use namespaced classes by default (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2844).

Discussion
----------

Use namespaced classes by default

Commits
-------

3632a46e moved to namespaced classes by default
db751d62 fixed some class names
66b708bd bumped version to 1.38
2019-02-15 08:31:33 +01:00
Fabien Potencier 3632a46e82 moved to namespaced classes by default 2019-02-15 08:28:49 +01:00
Fabien Potencier db751d62d3 fixed some class names 2019-02-15 08:28:49 +01:00
Fabien Potencier 66b708bde8 bumped version to 1.38 2019-02-15 08:28:49 +01:00
Fabien Potencier f5ef60924a Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
  fixed some PHPUnit assertions
2019-02-15 08:00:14 +01:00
Fabien Potencier 966296ff42 fixed CS 2019-02-15 07:56:53 +01:00
Fabien Potencier 7600efc010 minor #2843 Fix some PHPUnit assertions (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix some PHPUnit assertions

Commits
-------

40c6f1d1 fixed some PHPUnit assertions
2019-02-15 07:20:44 +01:00
Fabien Potencier 40c6f1d1b9 fixed some PHPUnit assertions 2019-02-15 07:19:24 +01:00
Fabien Potencier 1e4466523f fixed CS 2019-02-15 06:19:39 +01:00
Fabien Potencier 91ffc7fcef Merge branch '1.x' into 2.x
* 1.x:
  tweaked PHP-CS-Fixer config
2019-02-15 06:19:26 +01:00
Fabien Potencier 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 tweaked PHP-CS-Fixer config
2019-02-15 06:18:14 +01:00
Fabien Potencier 98a15a8973 tweaked PHP-CS-Fixer config 2019-02-15 06:17:13 +01:00
Fabien Potencier 3486de9e35 fixed CS 2019-02-15 06:06:19 +01:00
Fabien Potencier 9b1ff6a90b Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
2019-02-15 06:05:53 +01:00
Fabien Potencier a8e7eacd46 minor #2841 Change PHP-CS config (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Change PHP-CS config

Commits
-------

add887d6 fixed CS
2019-02-15 06:04:38 +01:00
Fabien Potencier 010cfaf48f fixed CS 2019-02-15 06:02:12 +01:00
Fabien Potencier afdb54cc06 Merge branch '1.x' into 2.x
* 1.x:
  prefixed some classes with a backslash
2019-02-15 05:55:16 +01:00
Fabien Potencier cfca482226 minor #2840 Cs fixes (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Cs fixes

Commits
-------

b8daa6c4 prefixed some classes with a backslash
2019-02-15 05:53:51 +01:00
Fabien Potencier b8daa6c458 prefixed some classes with a backslash 2019-02-15 05:51:47 +01:00
Fabien Potencier add887d60c fixed CS 2019-02-15 04:46:05 +01:00
Fabien Potencier 19da8de66d Merge branch '1.x' into 2.x
* 1.x:
  simplified some phpdocs
2019-02-15 04:24:29 +01:00
Fabien Potencier 3845d5247a minor #2839 Simplify some phpdocs (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Simplify some phpdocs

Commits
-------

ceb3c93e simplified some phpdocs
2019-02-15 04:22:20 +01:00
Fabien Potencier 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
Fabien Potencier ceb3c93e28 simplified some phpdocs 2019-02-15 04:20:04 +01:00
Fabien Potencier 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 added some docs about the difference between the include tag and the include function
2019-02-15 04:03:34 +01:00
Fabien Potencier 5e76342b40 minor #2838 Deprecate Parser::isReservedMacroName() (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Deprecate Parser::isReservedMacroName()

Commits
-------

85972a04 deprecated Parser::isReservedMacroName()
2019-02-15 03:42:12 +01:00
Fabien Potencier 85972a040e deprecated Parser::isReservedMacroName() 2019-02-15 03:39:46 +01:00
Fabien Potencier 185a11d243 tweaked message 2019-02-15 03:34:39 +01:00
Fabien Potencier 0ff6e75c5d minor #2836 Tweak deprecations (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Tweak deprecations

Commits
-------

8488c7c2 tweaked deprecations
2019-02-15 03:25:21 +01:00
Fabien Potencier 8488c7c2a4 tweaked deprecations 2019-02-14 07:47:25 +01:00
Fabien Potencier 7dff42e893 Merge branch '1.x' into 2.x
* 1.x:
  fixed Travis config
2019-02-14 07:47:02 +01:00
Fabien Potencier 4ea6ff4a55 minor #2837 Fix Travis config (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix Travis config

Commits
-------

325acd21 fixed Travis config
2019-02-14 07:45:28 +01:00