Skip to content

Commit

Permalink
Tweak doc + travis config
Browse files Browse the repository at this point in the history
  • Loading branch information
GeLoLabs committed Dec 6, 2015
1 parent 495250e commit 8a375d7
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ env:
- COMPOSER_PREFER_LOWEST=false
- SYMFONY_DEPRECATIONS_HELPER=weak
- SYMFONY_VERSION=2.3.*
- SYMFONY_PHPUNIT_BRIDGE_VERSION=2.7.*

cache:
directories:
Expand All @@ -24,7 +25,7 @@ install:
- composer self-update
- composer require --no-update symfony/framework-bundle:${SYMFONY_VERSION}
- composer require --no-update symfony/form:${SYMFONY_VERSION}
- if [[ "$SYMFONY_VERSION" = "3.0.*" ]]; then composer require --dev --no-update symfony/phpunit-bridge:${SYMFONY_VERSION}; fi
- composer require --dev --no-update symfony/phpunit-bridge:${SYMFONY_PHPUNIT_BRIDGE_VERSION}
- if [[ "$SYMFONY_VERSION" = *dev* ]]; then sed -i "s/\"MIT\"/\"MIT\",\"minimum-stability\":\"dev\"/g" composer.json; fi
- composer update --prefer-source `if [[ $COMPOSER_PREFER_LOWEST = true ]]; then echo "--prefer-lowest --prefer-stable"; fi`

Expand All @@ -35,7 +36,9 @@ after_script: bin/coveralls -v
matrix:
include:
- php: 5.6
env: COMPOSER_PREFER_LOWEST=true
env: SYMFONY_VERSION=2.3.* COMPOSER_PREFER_LOWEST=true
- php: 5.6
env: SYMFONY_VERSION=3.0.* SYMFONY_PHPUNIT_BRIDGE_VERSION=3.0.* COMPOSER_PREFER_LOWEST=true
- php: 5.6
env: SYMFONY_VERSION=2.2.*
- php: 5.6
Expand All @@ -47,11 +50,13 @@ matrix:
- php: 5.6
env: SYMFONY_VERSION=2.7.*
- php: 5.6
env: SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=strict
env: SYMFONY_VERSION=2.8.* SYMFONY_PHPUNIT_BRIDGE_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=strict
- php: 5.6
env: SYMFONY_VERSION=3.0.* SYMFONY_PHPUNIT_BRIDGE_VERSION=3.0.* SYMFONY_DEPRECATIONS_HELPER=strict
- php: 5.6
env: SYMFONY_VERSION=3.0.* SYMFONY_DEPRECATIONS_HELPER=strict
env: SYMFONY_VERSION=3.0.*@dev SYMFONY_PHPUNIT_BRIDGE_VERSION=3.0.*@dev SYMFONY_DEPRECATIONS_HELPER=strict
allow_failures:
- php: 7.0
- env: SYMFONY_VERSION=3.0.*@dev SYMFONY_PHPUNIT_BRIDGE_VERSION=3.0.*@dev SYMFONY_DEPRECATIONS_HELPER=strict

notifications:
email: geloen.eric@gmail.com
8 changes: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ To run the tests, use the following command:
$ bin/phpunit
```

As your patch should also be compatible with Symfony 3, the bundle integrates the `symfony/phpunit-bridge` component
in order to detect if you're not using Symfony deprecated features. To detect them, configure the bridge in strict
mode with the following command:

``` bash
$ SYMFONY_DEPRECATIONS_HELPER=strict bin/phpunit
```

Then, when you have fixed the bug, tested it and documented it, you can commit and push it with the following commands:

``` bash
Expand Down
3 changes: 2 additions & 1 deletion Resources/doc/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ $builder->add('field', 'ckeditor', array(

**NOTE** As of Symfony 2.8, the second parameter for ``$builder->add()`` accepts the fully qualified class name of the
form type and is required in Symfony 3.0. In these Symfony versions, you should replace the ``ckeditor`` parameter value
with ``Ivory\CKEditorBundle\Form\Type\CKEditorType``.
with ``Ivory\CKEditorBundle\Form\Type\CKEditorType`` or its constant ``CKEditorType::class`` if your on PHP 5.5 or
upper.

A toolbar is an array of toolbars (strips), each one being also an array, containing a list of UI items. To do a
carriage return, you just have to add the char ``/`` between strips.
Expand Down

0 comments on commit 8a375d7

Please sign in to comment.