Skip to content

Commit

Permalink
Merge branch 'master' of github.com:sulu/SuluArticleBundle into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
wachterjohannes committed Jan 10, 2019
2 parents 5f6b4e9 + cdad7df commit 076dfee
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
keys:
- composer-v2-{{ checksum "composer.json" }}
- composer-v2-
- run: php -d memory_limit=2G /usr/local/bin/composer install -n --prefer-dist
- run: php -d memory_limit=-1 /usr/local/bin/composer install -n --prefer-dist
- save_cache:
key: composer-v2-{{ checksum "composer.json" }}
paths:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ matrix:
- ES_VERSION="2.4.4"
- ES_DOWNLOAD_URL="https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.zip"
- ENABLE_SWAP=true
- php: 7.2
- php: 7.3
env:
- COMPOSER_FLAGS="--prefer-dist --no-interaction"
- SYMFONY__PHPCR__TRANSPORT=jackrabbit
Expand Down
2 changes: 1 addition & 1 deletion Document/Form/ArticleDocumentType.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
parent::buildForm($builder, $options);

// extensions
$builder->add('extensions', TextType::class, ['property_path' => 'extensionsData']);
$builder->add('extensions', UnstructuredType::class, ['property_path' => 'extensionsData']);
$builder->add('shadowLocaleEnabled', CheckboxType::class);
$builder->add('shadowLocale', TextType::class);
$builder->add('mainWebspace', TextType::class);
Expand Down
32 changes: 32 additions & 0 deletions Document/Form/UnstructuredType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

/*
* This file is part of Sulu.
*
* (c) MASSIVE ART WebServices GmbH
*
* This source file is subject to the MIT license that is bundled
* with this source code in the file LICENSE.
*/

namespace Sulu\Bundle\ArticleBundle\Document\Form;

use Symfony\Component\Form\AbstractType;
use Symfony\Component\OptionsResolver\OptionsResolver;

/**
* @internal
*/
class UnstructuredType extends AbstractType
{
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'compound' => false,
'multiple' => true,
]);
}
}
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"phpunit/phpunit": "^4.8 || ^5.0",
"sulu/automation-bundle": "^1.2",
"php-task/task-bundle": "^1.2",
"php-task/php-task": "^1.2"
"php-task/php-task": "^1.2",
"doctrine/data-fixtures": "^1.0"
},
"suggest": {
"sulu/automation-bundle": "Allows to outsource long-running route update processes."
Expand Down

0 comments on commit 076dfee

Please sign in to comment.