Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sulu/SuluArticleBundle
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.6
Choose a base ref
...
head repository: mario-fehr/SuluArticleBundle
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.x
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Feb 22, 2021

  1. Add functionality to remove single locale from article (#537)

    * Add functionality to remove single locale from article
    
    * Add backwards compatibility
    Prokyonn authored Feb 22, 2021
    Copy the full SHA
    cd28e02 View commit details

Commits on Feb 26, 2021

  1. Copy the full SHA
    788105e View commit details

Commits on Mar 10, 2021

  1. Copy the full SHA
    37e9da7 View commit details

Commits on Mar 12, 2021

  1. Add configuration for experimental content bundle storage (#553)

    * Add basic configuration for content bundle storage
    
    * Add docs about experimental storage
    
    * Fix article bundle conflicts
    
    * Fix prefer lowest tests
    
    * Add prefer stable to lowest dependencies
    
    * Fix min requirement for sulu/sulu
    
    * Improve code readability
    alexander-schranz authored Mar 12, 2021
    Copy the full SHA
    93ec60e View commit details

Commits on Mar 15, 2021

  1. Add experimental article admin with article content dimension entity (#…

    …554)
    
    * Add article admin with article content dimension entity
    
    * Update Article/Infrastructure/Sulu/Admin/ArticleAdmin.php
    
    Co-authored-by: nnatter <niklas.natter@gmail.com>
    alexander-schranz and niklasnatter authored Mar 15, 2021
    Copy the full SHA
    b5f5384 View commit details

Commits on Mar 24, 2021

  1. Copy the full SHA
    26a8dd8 View commit details
  2. Copy the full SHA
    0df3b77 View commit details
  3. Copy the full SHA
    a9f731c View commit details

Commits on Mar 25, 2021

  1. Copy the full SHA
    f404dfe View commit details

Commits on Apr 9, 2021

  1. Copy the full SHA
    1dd058a View commit details

Commits on Apr 12, 2021

  1. Copy the full SHA
    fbfb290 View commit details

Commits on Apr 19, 2021

  1. Copy the full SHA
    131c3ff View commit details
  2. Copy the full SHA
    7939608 View commit details

Commits on May 10, 2021

  1. Copy the full SHA
    9b3dd48 View commit details

Commits on May 14, 2021

  1. Copy the full SHA
    1918478 View commit details

Commits on May 25, 2021

  1. Copy the full SHA
    2d2ce3e View commit details

Commits on May 27, 2021

  1. Copy the full SHA
    09d0ed1 View commit details
  2. Copy the full SHA
    bf62ec5 View commit details

Commits on May 28, 2021

  1. Copy the full SHA
    b725301 View commit details

Commits on Jun 2, 2021

  1. Copy the full SHA
    6987fe6 View commit details

Commits on Jun 17, 2021

  1. Copy the full SHA
    8857c9f View commit details

Commits on Jun 24, 2021

  1. Copy the full SHA
    2ef1621 View commit details

Commits on Aug 2, 2021

  1. Copy the full SHA
    4c4779f View commit details

Commits on Aug 5, 2021

  1. Copy the full SHA
    3f62647 View commit details

Commits on Oct 14, 2021

  1. Copy the full SHA
    c2e36c1 View commit details

Commits on Nov 11, 2021

  1. Copy the full SHA
    513ea83 View commit details

Commits on Nov 23, 2021

  1. Copy the full SHA
    a2d6df7 View commit details

Commits on Mar 23, 2022

  1. Copy the full SHA
    868de30 View commit details

Commits on Apr 11, 2022

  1. Copy the full SHA
    861f623 View commit details

Commits on Jul 6, 2022

  1. Copy the full SHA
    af36456 View commit details

Commits on Dec 2, 2022

  1. Merge branch '2.5' of https://github.com/sulu/SuluArticleBundle into 2.x

     Conflicts:
    	.gitattributes
    	.github/workflows/test-application.yaml
    	DependencyInjection/Configuration.php
    	DependencyInjection/SuluArticleExtension.php
    	SuluArticleBundle.php
    	Tests/Application/Kernel.php
    	Tests/Application/config/config.yml
    	composer.json
    alexander-schranz committed Dec 2, 2022
    Copy the full SHA
    d7b691b View commit details
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -4,6 +4,6 @@
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
phpstan.neon export-ignore
phpunit.xml.dist export-ignore
.php-cs-fixer.dist.php export-ignore
.phpstan.neon export-ignore
.phpunit.xml.dist export-ignore
1 change: 0 additions & 1 deletion .github/workflows/test-application.yaml
Original file line number Diff line number Diff line change
@@ -54,7 +54,6 @@ jobs:
dependency-versions: 'highest'
php-extensions: 'ctype, iconv, mysql, imagick'
tools: 'composer:v2'
phpstan: false
lint: false
env:
SYMFONY_DEPRECATIONS_HELPER: weak
28 changes: 27 additions & 1 deletion DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@

use Sulu\Bundle\ArticleBundle\Document\ArticlePageViewObject;
use Sulu\Bundle\ArticleBundle\Document\ArticleViewDocument;
use Sulu\Bundle\ArticleBundle\Domain\Model\Article;
use Sulu\Bundle\ArticleBundle\Domain\Model\ArticleDimensionContent;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;

@@ -21,14 +23,38 @@
*/
class Configuration implements ConfigurationInterface
{
public const ARTICLE_STORAGE_PHPCR = 'phpcr';
public const ARTICLE_STORAGE_EXPERIMENTAL = 'experimental';

public function getConfigTreeBuilder()
{
$treeBuilder = new TreeBuilder('sulu_article');
$rootNode = $treeBuilder->getRootNode();

$rootNode
->children()
->scalarNode('index_name')->isRequired()->end()
->enumNode('storage')
->values([self::ARTICLE_STORAGE_PHPCR, self::ARTICLE_STORAGE_EXPERIMENTAL])
->defaultValue(self::ARTICLE_STORAGE_PHPCR)
->end()
->arrayNode('objects')
->addDefaultsIfNotSet()
->children()
->arrayNode('article')
->addDefaultsIfNotSet()
->children()
->scalarNode('model')->defaultValue(Article::class)->end()
->end()
->end()
->arrayNode('article_content')
->addDefaultsIfNotSet()
->children()
->scalarNode('model')->defaultValue(ArticleDimensionContent::class)->end()
->end()
->end()
->end()
->end()
->scalarNode('index_name')->end()
->arrayNode('hosts')
->prototype('scalar')->end()
->end()
Loading