Commit graph

216 commits

Author SHA1 Message Date
Ryan Weaver 21576fce48 Marking new service has private, then adding a workaround for the integration test 2015-12-16 10:54:17 -05:00
Ryan Weaver 000c4b11ed removing unnecessary gitignore entry 2015-12-16 10:53:59 -05:00
Ryan Weaver 4e890d540a Adding symfony/dependency-injection specifically to avoid 2.2 bug with framework
Before framework-bundle 2.3.24, framework-bundle allowed for the 2.2 of the dependency-injection
component. However, 2.3 of DI added synchronized services, which framework-bundle uses. So,
framework-bundle 2.3 *really* needs di 2.2. This caused our integration tests to fail, because
the "lowest" deps included 2.3.0 of both components (which are not compatible).
2015-12-15 16:53:49 -05:00
Ryan Weaver c5f5046c8e Removing MarkdownTwigExtension dependency to MarkdownHelper
This allows the Twig extension to be used without the templating component.
This also introduces a new integration test as a sanity check that all the
configuration / compiler pass was setup correctly.
2015-12-15 16:08:41 -05:00
Ryan Weaver 27d6c8c866 Merge pull request #80 from KnpLabs/feature/symfony3
[WIP] Symfony3 support
2015-12-15 14:41:45 -06:00
Andrew Kovalyov 55b72549cc Add symfony3 2015-11-18 13:53:57 +02:00
Andrew Kovalyov 0572aec4b2 Merge pull request #79 from stof/better_travis
Improve the Travis setup
2015-11-11 21:39:25 +02:00
Andrew Kovalyov bd3f046d8c Merge pull request #77 from stof/patch-1
Allow newer versions of php-markdown
2015-11-11 21:39:13 +02:00
Yann Rabiller a57acee2de Merge pull request #78 from stof/fix_coverage_config
Exclude vendors from the code coverage
2015-09-30 09:24:28 +02:00
Christophe Coevoet 9154189409 Fix tests against php-markdown 1.5
The dev version of php-markdown is wrongly aliased as 1.4.x-dev right
now, so the build against dev versions installs the library with 1.5.0
features.
2015-09-29 17:00:46 +02:00
Christophe Coevoet cbdb33b243 Improve the Travis setup
- use the container-based infrastructure
- persist the composer download cache between builds
- disallow failures on PHP 7 and HHVM
- add testing against lowest bounds of dependencies
- add testing against dev version of dependencies
2015-09-29 16:52:27 +02:00
Christophe Coevoet 48931db081 Exclude vendors from the code coverage 2015-09-29 16:47:42 +02:00
Christophe Coevoet 31a829956b Allow newer versions of php-markdown 2015-09-29 16:29:54 +02:00
Andrew Kovalyov 3454372665 Merge pull request #76 from craue/patch-3
fix the `no_html` option
2015-08-20 14:00:10 +03:00
Andrew Kovalyov 49a16f9dd6 Merge pull request #75 from stof/patch-1
Switch the Twig integration to use non-deprecated APIs
2015-08-20 13:58:14 +03:00
Christophe Coevoet 0ecc8f0dec Remove wrong return 2015-08-20 12:49:40 +02:00
Christian Raue b1f3bc4ca1 fix the no_html option 2015-08-20 09:02:23 +02:00
Christophe Coevoet 6ca15b8314 Switch the Twig integration to use non-deprecated APIs 2015-08-19 15:51:52 +02:00
Andrew Kovalyov c2429efdbe Merge pull request #74 from stof/patch-3
Fix the branch alias for master
2015-08-19 13:12:11 +03:00
Christophe Coevoet c89fe5ca0e Fix the branch alias for master 2015-08-19 12:10:43 +02:00
Andrew Kovalyov 91c916f0e0 Merge pull request #71 from stof/patch-4
Remove usage of the deprecated target-dir feature
2015-08-19 11:20:02 +03:00
Andrew Kovalyov e723320408 Merge pull request #70 from stof/patch-3
Fix the registration of the PHP templating helper
2015-08-19 11:19:49 +03:00
Andrew Kovalyov 402e76a466 Merge pull request #69 from Soullivaneuh/patch-1
Add PHP 7 on Travis
2015-08-19 11:09:46 +03:00
Christophe Coevoet 8e47bda5fe Remove usage of the deprecated target-dir feature 2015-08-05 11:31:22 +02:00
Christophe Coevoet 57d1f237c6 Fix the registration of the PHP templating helper 2015-08-05 11:28:54 +02:00
Sullivan SENECHAL 2400e1ad9f Add PHP 7 on Travis
And remove 5.6 from allowed failures
2015-07-30 17:59:41 +02:00
Alex Demchenko 1384e05693 Merge pull request #67 from KnpLabs/fix/double-escaping
[RFR] Fix double escaping
2015-06-12 02:46:58 +03:00
Andrew Kovalyov 8d4254676a Add test case to cover configuration 2015-05-05 12:39:53 +02:00
Andrew Kovalyov bd9170ee10 Fix default configuration 2015-05-05 12:39:37 +02:00
Andrew Kovalyov 8423632a15 Fixed invalid logic of configuration which lead to double-escaping of html entities 2015-05-05 12:35:47 +02:00
Andrew Kovalyov 2bfabe5b80 Add phpunit ~4.5 to require-dev section 2015-05-05 12:27:05 +02:00
Andrew Kovalyov 53f0329c67 Add link to php-markdown lib. 2015-05-05 11:36:51 +02:00
Andrew Kovalyov 88b4e55239 Update README.markdown 2015-05-05 11:28:36 +02:00
Alex Demchenko 9ccca13101 Merge pull request #45 from vierbergenlars/fix-nohtml
Use no_markup option of the parser itself
2014-08-29 14:12:17 +03:00
Lars Vierbergen 8b30483894 Use no_html option on the parser itself
Just escaping the text before feeding it into the parser messes up
markdown quote blocks, since markdown uses > for quoting, and escaping
that turns it into >, which does not get parsed correctly.
2014-08-29 12:37:05 +02:00
Alex Demchenko 7dd5e0d983 Merge pull request #62 from mhor/update_php_markdown_dependency
update php-markdown dependency
2014-08-28 17:53:14 +03:00
maxime horcholle 5ccb03a668 update php-markdown dependency 2014-08-28 16:47:49 +02:00
Alex Demchenko 1076d79666 Merge pull request #60 from peterrehm/patch-2
Updated version constraint according to discussion
2014-05-26 09:57:55 +03:00
Peter Rehm b6703c6bf8 Updated version constraint according to discussion 2014-05-26 07:15:58 +02:00
Alex Demchenko c31f07b28d Merge pull request #59 from BattleRattle/fix-travis-php
Test newer PHP versions
2014-05-25 17:05:51 +03:00
Norman Soetbeer 337bc27b48 remove fixation on symfony version 2014-05-25 15:45:57 +02:00
Norman Soetbeer 4eebd4b6f4 use hhvm stable instead of nightly 2014-05-25 15:40:02 +02:00
Alex Demchenko 1f06adcf86 Merge pull request #58 from peterrehm/patch-1
Updated the recommended composer installation version
2014-05-25 14:50:22 +03:00
Peter Rehm 3ded28b30c Updated version string according to discussion 2014-05-25 12:33:45 +02:00
Norman Soetbeer 68211bdb59 Test newer PHP versions 2014-05-24 04:33:54 +02:00
Peter Rehm 2dffba450f Updated the recommended composer installation version 2014-05-23 21:39:43 +02:00
Alex Demchenko e682a82f25 Merge pull request #56 from elnur/sundown-parameters
Make the Sundown service classes overridable using parameters
2014-02-27 23:41:27 +02:00
Elnur Abdurrakhimov f8959e7bdd Make the Sundown service classes overridable using parameters 2014-02-24 21:08:07 +04:00
Alex Demchenko f6a3df1a1f Merge pull request #53 from stof/patch-3
Fixed the branch alias for master
2014-02-20 13:12:32 +02:00
Alex Demchenko c24fca93e1 Merge pull request #54 from stof/bc_interface
Reverted the interface renaming done in #50
2014-02-20 13:01:37 +02:00