Skip to content

limit symfony versions to avoid running out of memory on install #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ addons:
- enchant

php:
- 5.4
- 5.5
- 5.6
- 7.0
- hhvm

env:
- SYMFONY_VERSION='3.0.*'

branches:
only:
- master
Expand All @@ -28,9 +30,12 @@ branches:
matrix:
include:
- php: 5.4
env: COMPOSER_FLAGS="--prefer-lowest"
env:
- COMPOSER_FLAGS="--prefer-lowest"
- SYMFONY_VERSION='2.3.*'
- php: 5.6
env:
- SYMFONY_VERSION='2.4.*'
- PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
- COVERAGE=true
- php: 5.6
Expand Down
2 changes: 1 addition & 1 deletion Command/BaseInvalidateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ abstract class BaseInvalidateCommand extends ContainerAwareCommand
* If no cache manager is specified explicitly, fos_http_cache.cache_manager
* is automatically loaded.
*
* @param CacheManager|null $cacheManager The cache manager to talk to.
* @param CacheManager|null $cacheManager The cache manager to talk to
*/
public function __construct(CacheManager $cacheManager = null)
{
Expand Down
4 changes: 2 additions & 2 deletions Command/InvalidatePathCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class InvalidatePathCommand extends BaseInvalidateCommand
* If no cache manager is specified explicitly, fos_http_cache.cache_manager
* is automatically loaded.
*
* @param CacheManager|null $cacheManager The cache manager to talk to.
* @param string $commandName Name of this command, in case you want to reuse it.
* @param CacheManager|null $cacheManager The cache manager to talk to
* @param string $commandName Name of this command, in case you want to reuse it
*/
public function __construct(CacheManager $cacheManager = null, $commandName = 'fos:httpcache:invalidate:path')
{
Expand Down
4 changes: 2 additions & 2 deletions Command/InvalidateRegexCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class InvalidateRegexCommand extends BaseInvalidateCommand
* If no cache manager is specified explicitly, fos_http_cache.cache_manager
* is automatically loaded.
*
* @param CacheManager|null $cacheManager The cache manager to talk to.
* @param string $commandName Name of this command, in case you want to reuse it.
* @param CacheManager|null $cacheManager The cache manager to talk to
* @param string $commandName Name of this command, in case you want to reuse it
*/
public function __construct(CacheManager $cacheManager = null, $commandName = 'fos:httpcache:invalidate:regex')
{
Expand Down
4 changes: 2 additions & 2 deletions Command/InvalidateTagCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ class InvalidateTagCommand extends ContainerAwareCommand
*
* Passing CacheManager as argument is deprecated and will be restricted to TagHandler in 2.0.
*
* @param TagHandler|CacheManager|null $tagHandler The tag handler to talk to.
* @param string $commandName Name of this command, in case you want to reuse it.
* @param TagHandler|CacheManager|null $tagHandler The tag handler to talk to
* @param string $commandName Name of this command, in case you want to reuse it
*/
public function __construct($tagHandler = null, $commandName = 'fos:httpcache:invalidate:tag')
{
Expand Down
4 changes: 2 additions & 2 deletions Command/RefreshPathCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class RefreshPathCommand extends BaseInvalidateCommand
* If no cache manager is specified explicitly, fos_http_cache.cache_manager
* is automatically loaded.
*
* @param CacheManager|null $cacheManager The cache manager to talk to.
* @param string $commandName Name of this command, in case you want to reuse it.
* @param CacheManager|null $cacheManager The cache manager to talk to
* @param string $commandName Name of this command, in case you want to reuse it
*/
public function __construct(CacheManager $cacheManager = null, $commandName = 'fos:httpcache:refresh:path')
{
Expand Down
2 changes: 1 addition & 1 deletion Configuration/InvalidateRoute.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class InvalidateRoute extends ConfigurationAnnotation
/**
* Handle route name given without explicit key.
*
* @param string $value The route name.
* @param string $value The route name
*/
public function setValue($value)
{
Expand Down
8 changes: 4 additions & 4 deletions EventListener/AbstractRuleSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
class AbstractRuleSubscriber
{
/**
* @var array List of arrays with RuleMatcher, settings array.
* @var array List of arrays with RuleMatcher, settings array
*/
private $rulesMap = array();

/**
* Add a rule matcher with a list of header directives to apply if the
* request and response are matched.
*
* @param RuleMatcherInterface $ruleMatcher The headers apply to responses matched by this matcher.
* @param array $settings An array of header configuration.
* @param RuleMatcherInterface $ruleMatcher The headers apply to responses matched by this matcher
* @param array $settings An array of header configuration
*/
public function addRule(
RuleMatcherInterface $ruleMatcher,
Expand All @@ -42,7 +42,7 @@ public function addRule(
* @param Request $request
* @param Response $response
*
* @return array|false Settings to apply or false if no rule matched.
* @return array|false Settings to apply or false if no rule matched
*/
protected function matchRule(Request $request, Response $response)
{
Expand Down
10 changes: 5 additions & 5 deletions EventListener/CacheControlSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ class CacheControlSubscriber extends AbstractRuleSubscriber implements EventSubs
* If not empty, add a debug header with that name to all responses,
* telling the cache proxy to add debug output.
*
* @var string|bool Name of the header or false to add no header.
* @var string|bool Name of the header or false to add no header
*/
private $debugHeader;

/**
* @param string|bool $debugHeader Header to set to trigger debugging, or false to send no header.
* @param string|bool $debugHeader Header to set to trigger debugging, or false to send no header
*/
public function __construct($debugHeader = false)
{
Expand Down Expand Up @@ -148,7 +148,7 @@ public function onKernelResponse(FilterResponseEvent $event)
*
* @param Response $response
* @param array $directives
* @param bool $overwrite Whether to keep existing cache headers or to overwrite them.
* @param bool $overwrite Whether to keep existing cache headers or to overwrite them
*/
private function setCache(Response $response, array $directives, $overwrite)
{
Expand Down Expand Up @@ -185,7 +185,7 @@ private function setCache(Response $response, array $directives, $overwrite)
*
* @param Response $response
* @param array $controls
* @param bool $overwrite Whether to keep existing cache headers or to overwrite them.
* @param bool $overwrite Whether to keep existing cache headers or to overwrite them
*/
private function setExtraCacheDirectives(Response $response, array $controls, $overwrite)
{
Expand Down Expand Up @@ -216,7 +216,7 @@ private function setExtraCacheDirectives(Response $response, array $controls, $o
*
* @param Request $request
*
* @return bool True if the request is safe and headers can be set.
* @return bool True if the request is safe and headers can be set
*/
protected function isRequestSafe(Request $request)
{
Expand Down
2 changes: 1 addition & 1 deletion EventListener/InvalidationSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public function onKernelException()
/**
* Flush cache manager when console terminates or errors.
*
* @throws ExceptionCollection If an exception occurs during flush.
* @throws ExceptionCollection If an exception occurs during flush
*/
public function onConsoleTerminate(ConsoleEvent $event)
{
Expand Down
2 changes: 1 addition & 1 deletion EventListener/TagSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public static function getSubscribedEvents()
*
* @param Request $request
*
* @return array List of tags affected by the request.
* @return array List of tags affected by the request
*/
private function getAnnotationTags(Request $request)
{
Expand Down
2 changes: 1 addition & 1 deletion Handler/TagHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class TagHandler extends BaseTagHandler
* @param Response $response
* @param bool $replace Whether to replace the current tags on the
* response. If false, parses the header to merge
* tags.
* tags
*
* @return $this
*/
Expand Down
4 changes: 2 additions & 2 deletions Http/RuleMatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ class RuleMatcher implements RuleMatcherInterface
private $expressionLanguage;

/**
* @param RequestMatcherInterface $requestMatcher Strategy to match the request.
* @param array $criteria Additional criteria not covered by request matcher.
* @param RequestMatcherInterface $requestMatcher Strategy to match the request
* @param array $criteria Additional criteria not covered by request matcher
*/
public function __construct(RequestMatcherInterface $requestMatcher, array $criteria)
{
Expand Down
2 changes: 1 addition & 1 deletion Http/RuleMatcherInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ interface RuleMatcherInterface
* @param Request $request
* @param Response $response
*
* @return bool True if request and response match, false otherwise.
* @return bool True if request and response match, false otherwise
*/
public function matches(Request $request, Response $response);
}
2 changes: 1 addition & 1 deletion HttpCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* Base class for enhanced Symfony reverse proxy based on the symfony FrameworkBundle HttpCache.
*
* @deprecated Use FOS\HttpCacheBundle\SymfonyCache\EventDispatchingHttpCache instead.
* @deprecated Use FOS\HttpCacheBundle\SymfonyCache\EventDispatchingHttpCache instead
*
* @author Jérôme Vieilledent <[email protected]> (courtesy of eZ Systems AS)
*
Expand Down
4 changes: 2 additions & 2 deletions Tests/Functional/Command/CommandTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ abstract class CommandTestCase extends WebTestCase
*
* @param Client $client
* @param string $command
* @param int $verbosity Verbosity level to use.
* @param int $exitCode Expected command exit code.
* @param int $verbosity Verbosity level to use
* @param int $exitCode Expected command exit code
*
* @return string
*/
Expand Down
2 changes: 1 addition & 1 deletion Tests/Unit/DependencyInjection/ConfigurationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ public function testRulesBothStatusAndExpression()
}

/**
* @return array The configuration when nothing is specified.
* @return array The configuration when nothing is specified
*/
private function getEmptyConfig()
{
Expand Down
2 changes: 1 addition & 1 deletion UserContext/RoleProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __construct($context = null)
/**
* {@inheritdoc}
*
* @throws InvalidConfigurationException when called without a security context being set.
* @throws InvalidConfigurationException when called without a security context being set
*/
public function updateUserContext(UserContext $context)
{
Expand Down