Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 8ddd842

Browse files
committed
replase ckeditor
1 parent 62aacbc commit 8ddd842

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
language: php
1717

1818
php:
19-
- 7.1
19+
- "7.1"
2020

2121
sudo: false
2222

@@ -26,24 +26,24 @@ cache:
2626
- $HOME/.composer/cache/files
2727

2828
env:
29-
matrix: SYMFONY_VERSION=4.0.*
29+
matrix: SYMFONY_VERSION="4.0.*""
3030
global:
31-
- SYMFONY_DEPRECATIONS_HELPER="0"
31+
- SYMFONY_DEPRECATIONS_HELPER="weak"
3232
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
3333
- KERNEL_CLASS=Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Fixtures\App\Kernel
34-
- SYMFONY_PHPUNIT_VERSION=5.7
34+
- SYMFONY_PHPUNIT_VERSION=5.7.26
3535
- TEST_INSTALLATION=false
3636
- COMPOSER_MEMORY_LIMIT=-1
3737

3838
matrix:
3939
include:
40-
- php: 7.1
40+
- php: "7.1"
4141
env: STABILITY=dev SYMFONY_VERSION=4.0.*
42-
- php: 7.1
42+
- php: "7.1"
4343
env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
44-
- php: 7.1
44+
- php: "7.1"
4545
env: STABILITY=dev SYMFONY_VERSION=3.3.*
46-
- php: 7.1
46+
- php: "7.1"
4747
env: STABILITY=dev SYMFONY_VERSION=3.4.*
4848
- env: TEST_INSTALLATION=true
4949
fast_finish: true

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"doctrine/phpcr-bundle": "To persist the metadata in PHPCR ODM documents",
5050
"doctrine/doctrine-bundle": "To persist the metadata in ORM entities",
5151
"doctrine/orm": "To persist the metadata in ORM entities, ~2.4",
52-
"friendsofsymfony/ckeditor-bundl": "To have CkEditor support on textareas."
52+
"friendsofsymfony/ckeditor-bundle": "To have CkEditor support on textareas."
5353
},
5454
"autoload": {
5555
"psr-4": {

src/Admin/Content/StaticContentAdmin.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ public function getExportFormats()
4040
/**
4141
* Set configuration for CKEditorType.
4242
*
43-
* Documentation: https://symfony.com/doc/master/bundles/FOSCKEditorBundle/usage/config.html
44-
*
43+
* Documentation: https://symfony.com/doc/master/bundles/FOSCKEditorBundle/index.html
4544
* @param array $config configuration for CKEditorType
4645
*/
4746
public function setCkEditorConfig(array $config)

src/DependencyInjection/Factory/ContentAdminFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ public function create(array $config, ContainerBuilder $container, XmlFileLoader
6262
{
6363
$loader->load('content.xml');
6464

65-
$message = 'FOSCKEditorBundle integration was explicitely enabled, but the bundle is not available.';
65+
$message = 'CKEditorBundle integration was explicitely enabled, but the bundle is not available.';
6666
if (class_exists(FOSCKEditorBundle::class)) {
6767
$message .= ' (did you forget to register the bundle in the AppKernel?)';
6868
}
6969

7070
$ckeditorConfig = [];
71-
if ($this->isConfigEnabledAuto($container, $config['fos_ckeditor']['enabled'], 'FOSCKEditorBundle', $message)) {
71+
if ($this->isConfigEnabledAuto($container, $config['fos_ckeditor']['enabled'], 'CKEditorBundle', $message)) {
7272
if (!isset($config['fos_ckeditor']['config_name'])) {
73-
throw new InvalidConfigurationException('The cmf_sonata_phpcr_admin_integration.bundles.content.fos_ckeditor.config_name setting has to be defined when FOSCKEditorBundle integration is enabled.');
73+
throw new InvalidConfigurationException('The cmf_sonata_phpcr_admin_integration.bundles.content.fos_ckeditor.config_name setting has to be defined when CKEditorBundle integration is enabled.');
7474
}
7575

7676
unset($config['fos_ckeditor']['enabled']);

tests/Fixtures/App/config/bundles.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
Symfony\Cmf\Bundle\MenuBundle\CmfMenuBundle::class => ['all' => true],
2828
Symfony\Cmf\Bundle\ContentBundle\CmfContentBundle::class => ['all' => true],
2929
JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
30-
FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true],
30+
CKEditorBundle::class => ['all' => true],
3131
SonataBlockBundle::class => ['all' => true],
3232
SonataCoreBundle::class => ['all' => true],
3333
SonataAdminBundle::class => ['all' => true],

tests/Unit/DependencyInjection/Factory/ContentAdminFactoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ protected function setUp()
3333
{
3434
$this->factory = new ContentAdminFactory();
3535
$this->container = new ContainerBuilder();
36-
$this->container->setParameter('kernel.bundles', ['FOSCKEditorBundle' => true]);
36+
$this->container->setParameter('kernel.bundles', ['CKEditorBundle' => true]);
3737
$this->fileLoader = $this->createMock(XmlFileLoader::class);
3838
}
3939

4040
/**
4141
* @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
42-
* @expectedExceptionMessage config_name setting has to be defined when FOSCKEditorBundle integration is enabled
42+
* @expectedExceptionMessage config_name setting has to be defined when CKEditorBundle integration is enabled
4343
*/
4444
public function testInvalidCKEditorEnabledWithoutConfigName()
4545
{

0 commit comments

Comments
 (0)