Merge pull request #308 from FriendsOfSymfony/dbu-patch-1

dbu · web-flow · commit fa6b5a4d7ad6 · 2016-08-24T21:21:50.000+02:00
limit symfony versions to avoid running out of memory on install
diff --git a/.travis.yml b/.travis.yml
@@ -14,12 +14,14 @@ addons:
       - enchant
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
   - hhvm
 
+env:
+  - SYMFONY_VERSION='3.0.*'
+
 branches:
   only:
     - master
@@ -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
diff --git a/Command/BaseInvalidateCommand.php b/Command/BaseInvalidateCommand.php
@@ -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)
     {
diff --git a/Command/InvalidatePathCommand.php b/Command/InvalidatePathCommand.php
@@ -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')
     {
diff --git a/Command/InvalidateRegexCommand.php b/Command/InvalidateRegexCommand.php
@@ -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')
     {
diff --git a/Command/InvalidateTagCommand.php b/Command/InvalidateTagCommand.php
@@ -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')
     {
diff --git a/Command/RefreshPathCommand.php b/Command/RefreshPathCommand.php
@@ -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')
     {
diff --git a/Configuration/InvalidateRoute.php b/Configuration/InvalidateRoute.php
@@ -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)
     {
diff --git a/EventListener/AbstractRuleSubscriber.php b/EventListener/AbstractRuleSubscriber.php
@@ -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,
@@ -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)
     {
diff --git a/EventListener/CacheControlSubscriber.php b/EventListener/CacheControlSubscriber.php
@@ -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)
     {
@@ -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)
     {
@@ -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)
     {
@@ -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)
     {
diff --git a/EventListener/InvalidationSubscriber.php b/EventListener/InvalidationSubscriber.php
@@ -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)
     {
diff --git a/EventListener/TagSubscriber.php b/EventListener/TagSubscriber.php
@@ -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)
     {
diff --git a/Handler/TagHandler.php b/Handler/TagHandler.php
@@ -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
      */
diff --git a/Http/RuleMatcher.php b/Http/RuleMatcher.php
@@ -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)
     {
diff --git a/Http/RuleMatcherInterface.php b/Http/RuleMatcherInterface.php
@@ -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);
 }
diff --git a/HttpCache.php b/HttpCache.php
@@ -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 <lolautruche@gmail.com> (courtesy of eZ Systems AS)
  *
diff --git a/Tests/Functional/Command/CommandTestCase.php b/Tests/Functional/Command/CommandTestCase.php
@@ -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
      */
diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -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()
     {
diff --git a/UserContext/RoleProvider.php b/UserContext/RoleProvider.php
@@ -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)
     {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ abstract class BaseInvalidateCommand extends ContainerAwareCommand`
`30`	`30`	`* If no cache manager is specified explicitly, fos_http_cache.cache_manager`
`31`	`31`	`* is automatically loaded.`
`32`	`32`	`*`
`33`		`- * @param CacheManager\|null $cacheManager The cache manager to talk to.`
	`33`	`+ * @param CacheManager\|null $cacheManager The cache manager to talk to`
`34`	`34`	`*/`
`35`	`35`	`public function __construct(CacheManager $cacheManager = null)`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ class InvalidatePathCommand extends BaseInvalidateCommand`
`32`	`32`	`* If no cache manager is specified explicitly, fos_http_cache.cache_manager`
`33`	`33`	`* is automatically loaded.`
`34`	`34`	`*`
`35`		`- * @param CacheManager\|null $cacheManager The cache manager to talk to.`
`36`		`- * @param string $commandName Name of this command, in case you want to reuse it.`
	`35`	`+ * @param CacheManager\|null $cacheManager The cache manager to talk to`
	`36`	`+ * @param string $commandName Name of this command, in case you want to reuse it`
`37`	`37`	`*/`
`38`	`38`	`public function __construct(CacheManager $cacheManager = null, $commandName = 'fos:httpcache:invalidate:path')`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ class InvalidateRegexCommand extends BaseInvalidateCommand`
`33`	`33`	`* If no cache manager is specified explicitly, fos_http_cache.cache_manager`
`34`	`34`	`* is automatically loaded.`
`35`	`35`	`*`
`36`		`- * @param CacheManager\|null $cacheManager The cache manager to talk to.`
`37`		`- * @param string $commandName Name of this command, in case you want to reuse it.`
	`36`	`+ * @param CacheManager\|null $cacheManager The cache manager to talk to`
	`37`	`+ * @param string $commandName Name of this command, in case you want to reuse it`
`38`	`38`	`*/`
`39`	`39`	`public function __construct(CacheManager $cacheManager = null, $commandName = 'fos:httpcache:invalidate:regex')`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ class InvalidateTagCommand extends ContainerAwareCommand`
`41`	`41`	`*`
`42`	`42`	`* Passing CacheManager as argument is deprecated and will be restricted to TagHandler in 2.0.`
`43`	`43`	`*`
`44`		`- * @param TagHandler\|CacheManager\|null $tagHandler The tag handler to talk to.`
`45`		`- * @param string $commandName Name of this command, in case you want to reuse it.`
	`44`	`+ * @param TagHandler\|CacheManager\|null $tagHandler The tag handler to talk to`
	`45`	`+ * @param string $commandName Name of this command, in case you want to reuse it`
`46`	`46`	`*/`
`47`	`47`	`public function __construct($tagHandler = null, $commandName = 'fos:httpcache:invalidate:tag')`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ class RefreshPathCommand extends BaseInvalidateCommand`
`32`	`32`	`* If no cache manager is specified explicitly, fos_http_cache.cache_manager`
`33`	`33`	`* is automatically loaded.`
`34`	`34`	`*`
`35`		`- * @param CacheManager\|null $cacheManager The cache manager to talk to.`
`36`		`- * @param string $commandName Name of this command, in case you want to reuse it.`
	`35`	`+ * @param CacheManager\|null $cacheManager The cache manager to talk to`
	`36`	`+ * @param string $commandName Name of this command, in case you want to reuse it`
`37`	`37`	`*/`
`38`	`38`	`public function __construct(CacheManager $cacheManager = null, $commandName = 'fos:httpcache:refresh:path')`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class InvalidateRoute extends ConfigurationAnnotation`
`32`	`32`	`/**`
`33`	`33`	`* Handle route name given without explicit key.`
`34`	`34`	`*`
`35`		`- * @param string $value The route name.`
	`35`	`+ * @param string $value The route name`
`36`	`36`	`*/`
`37`	`37`	`public function setValue($value)`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,12 @@ class CacheControlSubscriber extends AbstractRuleSubscriber implements EventSubs`
`50`	`50`	`* If not empty, add a debug header with that name to all responses,`
`51`	`51`	`* telling the cache proxy to add debug output.`
`52`	`52`	`*`
`53`		`- * @var string\|bool Name of the header or false to add no header.`
	`53`	`+ * @var string\|bool Name of the header or false to add no header`
`54`	`54`	`*/`
`55`	`55`	`private $debugHeader;`
`56`	`56`
`57`	`57`	`/**`
`58`		`- * @param string\|bool $debugHeader Header to set to trigger debugging, or false to send no header.`
	`58`	`+ * @param string\|bool $debugHeader Header to set to trigger debugging, or false to send no header`
`59`	`59`	`*/`
`60`	`60`	`public function __construct($debugHeader = false)`
`61`	`61`	`{`
`@@ -148,7 +148,7 @@ public function onKernelResponse(FilterResponseEvent $event)`
`148`	`148`	`*`
`149`	`149`	`* @param Response $response`
`150`	`150`	`* @param array $directives`
`151`		`- * @param bool $overwrite Whether to keep existing cache headers or to overwrite them.`
	`151`	`+ * @param bool $overwrite Whether to keep existing cache headers or to overwrite them`
`152`	`152`	`*/`
`153`	`153`	`private function setCache(Response $response, array $directives, $overwrite)`
`154`	`154`	`{`
`@@ -185,7 +185,7 @@ private function setCache(Response $response, array $directives, $overwrite)`
`185`	`185`	`*`
`186`	`186`	`* @param Response $response`
`187`	`187`	`* @param array $controls`
`188`		`- * @param bool $overwrite Whether to keep existing cache headers or to overwrite them.`
	`188`	`+ * @param bool $overwrite Whether to keep existing cache headers or to overwrite them`
`189`	`189`	`*/`
`190`	`190`	`private function setExtraCacheDirectives(Response $response, array $controls, $overwrite)`
`191`	`191`	`{`
`@@ -216,7 +216,7 @@ private function setExtraCacheDirectives(Response $response, array $controls, $o`
`216`	`216`	`*`
`217`	`217`	`* @param Request $request`
`218`	`218`	`*`
`219`		`- * @return bool True if the request is safe and headers can be set.`
	`219`	`+ * @return bool True if the request is safe and headers can be set`
`220`	`220`	`*/`
`221`	`221`	`protected function isRequestSafe(Request $request)`
`222`	`222`	`{`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function onKernelException()`
`119`	`119`	`/**`
`120`	`120`	`* Flush cache manager when console terminates or errors.`
`121`	`121`	`*`
`122`		`- * @throws ExceptionCollection If an exception occurs during flush.`
	`122`	`+ * @throws ExceptionCollection If an exception occurs during flush`
`123`	`123`	`*/`
`124`	`124`	`public function onConsoleTerminate(ConsoleEvent $event)`
`125`	`125`	`{`