geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-17 04:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,951 Commits 10 Branches 273 Tags
6b9c3aeacd243f77773b6e2aafcedbe7e340f3f0
Commit Graph

4951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier 6b9c3aeacd Merge branch '2.x' into 3.x 
* 2.x:
  fixed wrong class usage
  made a class final
  added suggestions for extra extensions
  fixed path
  added missing dep
  fixed Travis config
  fixed config/ directory in extra bundle
  Revamping bundle structure to not mix source code with config files
  Fix PHPDoc of twig_get_attribute()
 2019-08-10 14:59:35 +02:00
Fabien Potencier f3355fe878 fixed wrong class usage 2019-08-10 14:59:27 +02:00
Fabien Potencier 51242d807f made a class final 2019-08-10 14:48:51 +02:00
Fabien Potencier 19a1487f85 feature #3118 Add suggestions for extra extensions (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Add suggestions for extra extensions

Commits
-------

908eef05 added suggestions for extra extensions
 2019-08-10 14:32:15 +02:00
Fabien Potencier 908eef05de added suggestions for extra extensions 2019-08-10 14:29:58 +02:00
Fabien Potencier 879d1b1e76 fixed path 2019-08-10 14:29:31 +02:00
Fabien Potencier a8ccf22d4b added missing dep 2019-08-10 14:21:21 +02:00
Fabien Potencier af1ead5014 fixed Travis config 2019-08-10 14:19:10 +02:00
Fabien Potencier 2658b4a390 fixed config/ directory in extra bundle 2019-08-10 14:18:25 +02:00
Fabien Potencier 43a7e3ae09 minor #3119 Revamping bundle structure to not mix source code with config files (yceruto) 
This PR was merged into the 2.x branch.

Discussion
----------

Revamping bundle structure to not mix source code with config files

Still compatible with any Symfony version.

Commits
-------

f24f057a Revamping bundle structure to not mix source code with config files
 2019-08-10 14:11:12 +02:00
Yonel Ceruto f24f057a15 Revamping bundle structure to not mix source code with config files 2019-08-10 08:00:43 -04:00
Fabien Potencier 8374211dd8 minor #3117 Fix PHPDoc of twig_get_attribute() (szepeviktor) 
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead (closes #3117).

Discussion
----------

Fix PHPDoc of twig_get_attribute()

@fabpot Repel the attack of the French keyboard

props. @phpstan

Commits
-------

1aa7dbff Fix PHPDoc of twig_get_attribute()
 2019-08-10 13:39:14 +02:00
Viktor Szépe 1aa7dbff35 Fix PHPDoc of twig_get_attribute() 
Repel the attack of the French keyboard
 2019-08-10 13:39:07 +02:00
Fabien Potencier 6e3fa76d71 fixed bad merge 2019-08-10 11:56:26 +02:00
Fabien Potencier f8d0cb73f6 Merge branch '2.x' into 3.x 
* 2.x:
  fixed composer.json
 2019-08-10 11:55:29 +02:00
Fabien Potencier 33fbbe5097 fixed composer.json 2019-08-10 11:50:28 +02:00
Fabien Potencier c3a6f3cf31 Merge branch '2.x' into 3.x 
* 2.x:
  added the Markdown extension
 2019-08-10 11:31:32 +02:00
Fabien Potencier 5d6205ba90 feature #3115 Add the Markdown extension (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Add the Markdown extension

Commits
-------

741ea46e added the Markdown extension
 2019-08-10 11:29:54 +02:00
Fabien Potencier 741ea46e02 added the Markdown extension 2019-08-10 11:29:35 +02:00
Fabien Potencier 32ef272559 Merge branch '2.x' into 3.x 
* 2.x:
  fixed package name
 2019-08-10 11:25:12 +02:00
Fabien Potencier f8c0c76f46 fixed package name 2019-08-10 11:23:15 +02:00
Fabien Potencier 4b152df5a1 Merge branch '2.x' into 3.x 
* 2.x:
  fixed Travis
 2019-08-10 11:21:39 +02:00
Fabien Potencier 2e3aa4f7ec fixed Travis 2019-08-10 11:21:33 +02:00
Fabien Potencier 6d14d9c9db Merge branch '2.x' into 3.x 
* 2.x:
  fixed HTML extension
 2019-08-10 11:13:02 +02:00
Fabien Potencier be629b591b bug #3116 Fix HTML extension (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix HTML extension

Commits
-------

5cc40a06 fixed HTML extension
 2019-08-10 11:08:29 +02:00
Fabien Potencier 5cc40a06f1 fixed HTML extension 2019-08-10 11:07:38 +02:00
Fabien Potencier 41ab8b9699 Merge branch '2.x' into 3.x 
* 2.x:
  moved the HTML extension to an external Composer package
 2019-08-10 07:48:25 +02:00
Fabien Potencier 40fa5ea8ab feature #3113 move the HTML extension to an external Composer package (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

move the HTML extension to an external Composer package

Commits
-------

59bb9d10 moved the HTML extension to an external Composer package
 2019-08-10 07:41:42 +02:00
Fabien Potencier 59bb9d1033 moved the HTML extension to an external Composer package 2019-08-08 18:10:45 +02:00
Fabien Potencier 5b300ea457 Merge branch '2.x' into 3.x 
* 2.x:
  added an entry to .gitignore
 2019-08-08 18:07:37 +02:00
Fabien Potencier f07a7f388d Merge branch '1.x' into 2.x 
* 1.x:
  added an entry to .gitignore
 2019-08-08 18:07:29 +02:00
Fabien Potencier a8c77b85a7 added an entry to .gitignore 2019-08-08 18:07:23 +02:00
Fabien Potencier 879fb0adcc Merge branch '2.x' into 3.x 
* 2.x:
  removed usage of getmockBuilder() when not needed
  removed usage of getmockBuilder() when not needed
 2019-08-08 13:35:34 +02:00
Fabien Potencier c7b0a459ca removed usage of getmockBuilder() when not needed 2019-08-08 13:34:04 +02:00
Fabien Potencier 656c295ed9 Merge branch '1.x' into 2.x 
* 1.x:
  removed usage of getmockBuilder() when not needed
 2019-08-08 13:33:07 +02:00
Fabien Potencier 3ee934ef45 minor #3112 Remove usage of getmockBuilder() when not needed (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Remove usage of getmockBuilder() when not needed

/cc @jderusse

Commits
-------

5861a539 removed usage of getmockBuilder() when not needed
 2019-08-08 12:14:28 +02:00
Fabien Potencier 5861a539e4 removed usage of getmockBuilder() when not needed 2019-08-08 11:59:51 +02:00
Fabien Potencier 56f501c198 Merge branch '2.x' into 3.x 
* 2.x:
  Fix compatibility with PHPUnit 8
 2019-08-08 11:13:46 +02:00
Fabien Potencier bd45dfa518 minor #3111 Fix compatibility with PHPUnit 8 (jderusse) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix compatibility with PHPUnit 8

adds `: void` return typehint on methods `setup` and `teardown`

Commits
-------

f348f6ea Fix compatibility with PHPUnit 8
 2019-08-08 11:13:19 +02:00
Fabien Potencier 10edd832d2 code cleanup 2019-08-08 11:07:02 +02:00
Jérémy Derussé f348f6ea64 Fix compatibility with PHPUnit 8 2019-08-08 11:06:58 +02:00
Fabien Potencier fec3fd859f fixed PHPUnit deprecations 2019-08-08 11:06:15 +02:00
Fabien Potencier 5e3ede955b Merge branch '2.x' into 3.x 
* 2.x:
  Fix PHPUnit deprecations
  Update to PhpUnitBridge and fix deprecations
 2019-08-08 11:05:13 +02:00
Fabien Potencier c8577f8b77 minor #3110 Fix PHPUnit deprecations (fabpot) 
This PR was squashed before being merged into the 2.x branch (closes #3110).

Discussion
----------

Fix PHPUnit deprecations

#3103 followup for 2.x

Commits
-------

5ebcecf2 Fix PHPUnit deprecations
 2019-08-08 11:03:14 +02:00
Fabien Potencier 5ebcecf24b Fix PHPUnit deprecations 2019-08-08 11:03:05 +02:00
Fabien Potencier c829dafd75 Merge branch '1.x' into 2.x 
* 1.x:
  Update to PhpUnitBridge and fix deprecations
 2019-08-08 10:19:01 +02:00
Fabien Potencier 5aae9ba07a minor #3103 Update PhpUnitBridge and fix deprecations (jderusse) 
This PR was merged into the 1.x branch.

Discussion
----------

Update PhpUnitBridge and fix deprecations

This PR:
- update dev dependency to `phpunit-bridge` to `^4.4@dev` in order to get polyfill methods
- fix deprecated tests
- update cs-fixer rule

Commits
-------

b776e41f Update to PhpUnitBridge and fix deprecations
 2019-08-08 10:00:23 +02:00
Jérémy Derussé b776e41f5a Update to PhpUnitBridge and fix deprecations 2019-08-08 09:39:49 +02:00
Fabien Potencier 2b6ad5bca6 allowed Symfony 5 2019-08-08 01:34:31 +02:00
Fabien Potencier be7f9c5b3e Merge branch '2.x' into 3.x 
* 2.x:
  bumped some deps
 2019-08-08 01:34:20 +02:00