Skip to content

Commit 0db8937

Browse files
pascalmosersolverat
authored andcommitted
Fix #119 (#120)
* fix #119 * fix tests * add monolog conflict
1 parent b0c6492 commit 0db8937

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/ToolboxBundle/Resources/views/Toolbox/Bootstrap3/Accordion/AccordionTab/tab.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{% if editmode == false %}
2424
<div class="tab-content">
2525
{% for tab in tabContent %}
26-
<div role="tabpanel" class="tab-pane fade {{ tab.index == '1' ? 'active in' : '' }}" id="tab-{{ id }}-{{ tab.index }}">
26+
<div role="tabpanel" class="tab-pane fade {{ loop.index == '1' ? 'active in' : '' }}" id="tab-{{ id }}-{{ tab.index }}">
2727
{{ tab.content }}
2828
</div>
2929
{% endfor %}

src/ToolboxBundle/Resources/views/Toolbox/Bootstrap4/Accordion/AccordionTab/tab.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{% include '@Toolbox/Helper/areablock.html.twig' with {'name': 'accord', 'type' : 'accordion'} %}
1010
</div>
1111
{% else %}
12-
<a href="#panel-{{ id }}-{{ panel.currentIndex }}" id="tab-{{ id }}-{{ panel.currentIndex }}" class="nav-link {{ panel.currentIndex == '1' ? 'active' : '' }}" aria-controls="panel-{{ id }}-{{ panel.currentIndex }}" role="tab" data-toggle="tab" aria-expanded="{{ loop.first ? 'true' : 'false' }}">
12+
<a href="#panel-{{ id }}-{{ panel.currentIndex }}" id="tab-{{ id }}-{{ panel.currentIndex }}" class="nav-link {{ loop.index == 1 ? 'active' : '' }}" aria-controls="panel-{{ id }}-{{ panel.currentIndex }}" role="tab" data-toggle="tab" aria-expanded="{{ loop.first ? 'true' : 'false' }}">
1313
{{ pimcore_input('name').data }}
1414
</a>
1515
{% set content %}
@@ -23,10 +23,10 @@
2323
{% if editmode == false %}
2424
<div class="tab-content">
2525
{% for tab in tabContent %}
26-
<div role="tabpanel" class="tab-pane fade {{ tab.index == '1' ? 'show active' : '' }}" id="panel-{{ id }}-{{ tab.index }}" aria-labelledby="tab-{{ id }}-{{ tab.index }}">
26+
<div role="tabpanel" class="tab-pane fade {{ loop.index == 1 ? 'show active' : '' }}" id="panel-{{ id }}-{{ tab.index }}" aria-labelledby="tab-{{ id }}-{{ tab.index }}">
2727
{{ tab.content }}
2828
</div>
2929
{% endfor %}
3030
</div>
3131
{% endif %}
32-
</div>
32+
</div>

tests/_etc/travis/install

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,13 @@ rm composer.lock
5353
## add autoload-dev paths
5454
sed -i '0,/{/a \ "autoload-dev": { "psr-4": { "DachcomBundle\\Test\\App\\Services\\": "'$DACHCOM_BUNDLE_HOME'/lib/'$DACHCOM_BUNDLE_NAME'/tests/_support/App/Services" } },\' composer.json
5555

56+
## add monolog >= 2 conflict (not supported until symfony 5
57+
sed -i '0,/{/a \ "conflict": { "monolog/monolog": ">=2" },\' composer.json
58+
5659
composer config repositories.pimcore-${DACHCOM_BUNDLE_REPO_NAME} '{"type": "path", "url": "./lib/'${DACHCOM_BUNDLE_NAME}'", "options": {"symlink": true}}'
5760

58-
COMPOSER_MEMORY_LIMIT=-1 composer install --no-scripts
59-
COMPOSER_MEMORY_LIMIT=-1 composer require symfony/symfony:$SYMFONY_VERSION phpstan/phpstan:^0.11.1 phpstan/phpstan-symfony:^0.11.0 symplify/easy-coding-standard:^5.4 dachcom-digital/${DACHCOM_BUNDLE_REPO_NAME} @dev
61+
COMPOSER_MEMORY_LIMIT=-1 composer require symfony/symfony:$SYMFONY_VERSION --no-scripts
62+
COMPOSER_MEMORY_LIMIT=-1 composer require phpstan/phpstan:^0.11.1 phpstan/phpstan-symfony:^0.11.0 symplify/easy-coding-standard:^5.4 dachcom-digital/${DACHCOM_BUNDLE_REPO_NAME} @dev
6063

6164
## clear cache
6265
rm -rf var/cache

0 commit comments

Comments
 (0)