Skip to content

Commit

Permalink
Merge pull request #71 from larriereguichet/release/v0.4.3
Browse files Browse the repository at this point in the history
Release/v0.4.3
  • Loading branch information
johnkrovitch authored Dec 7, 2016
2 parents df0c768 + 606f12d commit 851a92b
Show file tree
Hide file tree
Showing 52 changed files with 2,736 additions and 511 deletions.
3 changes: 2 additions & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
tools:
external_code_coverage: true
external_code_coverage:
timeout: 300

filter:
excluded_paths:
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
language: php

php:
- 5.6
# temporary remove php 5.6 from Travis build as composer consumes too much memory and fails the build
#- 5.6
- 7.0
- hhvm

Expand All @@ -10,7 +11,7 @@ before_install:
- cp Tests/Fixtures/app/config/parameters.yml.dist Tests/Fixtures/app/config/parameters.yml

install:
- composer install
- composer install --profile --optimize-autoloader

script:
- bin/phpunit --coverage-text --coverage-clover=coverage.clover
Expand Down
16 changes: 15 additions & 1 deletion Action/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,20 @@ public function getConfiguration()
*/
public function isPaginationRequired()
{
return $this->configuration->getParameter('load_strategy') === AdminInterface::LOAD_STRATEGY_MULTIPLE;
return $this
->configuration
->getParameter('load_strategy') === AdminInterface::LOAD_STRATEGY_MULTIPLE;
}

/**
* Return true if one or more entities should be loaded ini this action.
*
* @return bool
*/
public function isLoadingRequired()
{
return $this
->configuration
->getParameter('load_strategy') !== AdminInterface::LOAD_STRATEGY_NONE;
}
}
7 changes: 7 additions & 0 deletions Action/ActionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,11 @@ public function addField(Field $field);
* @return bool
*/
public function isPaginationRequired();

/**
* Return true if the Action requires the loading of one or more entities.
*
* @return bool
*/
public function isLoadingRequired();
}
Loading

0 comments on commit 851a92b

Please sign in to comment.