Skip to content

Commit

Permalink
Merge branch '4.4'
Browse files Browse the repository at this point in the history
* 4.4:
  Improve some URLs
  cleanup remaining param  and internal Intl FulLTransformer
  [HttpClient] fix data loss when streaming as a PHP resource
  Fix test compatibility with 4.x components
  [Cache] cs fix
  • Loading branch information
nicolas-grekas committed Aug 8, 2019
2 parents 68c0142 + 1b3fc99 commit df4fef2
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 8 deletions.
2 changes: 0 additions & 2 deletions Console/Descriptor/Descriptor.php
Expand Up @@ -129,7 +129,6 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr
* * name: name of described service
*
* @param Definition|Alias|object $service
* @param array $options
*/
abstract protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null);

Expand Down Expand Up @@ -173,7 +172,6 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte
* Describes a callable.
*
* @param callable $callable
* @param array $options
*/
abstract protected function describeCallable($callable, array $options = []);

Expand Down
2 changes: 1 addition & 1 deletion DependencyInjection/FrameworkExtension.php
Expand Up @@ -227,7 +227,7 @@ public function load(array $configs, ContainerBuilder $container)

if ($this->isConfigEnabled($container, $config['session'])) {
if (!\extension_loaded('session')) {
throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://www.php.net/session.installation for instructions.');
throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://php.net/session.installation for instructions.');
}

$this->sessionConfigEnabled = true;
Expand Down
1 change: 0 additions & 1 deletion Routing/Router.php
Expand Up @@ -37,7 +37,6 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI

/**
* @param mixed $resource The main resource to load
* @param array $options An array of options
*/
public function __construct(ContainerInterface $container, $resource, array $options = [], RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null, string $defaultLocale = null)
{
Expand Down
4 changes: 0 additions & 4 deletions Translation/Translator.php
Expand Up @@ -65,10 +65,6 @@ class Translator extends BaseTranslator implements WarmableInterface
* * debug: Whether to enable debugging or not (false by default)
* * resource_files: List of translation resources available grouped by locale.
*
* @param string $defaultLocale
* @param array $loaderIds An array of loader Ids
* @param array $options An array of options
*
* @throws InvalidArgumentException
*/
public function __construct(ContainerInterface $container, MessageFormatterInterface $formatter, string $defaultLocale, array $loaderIds = [], array $options = [])
Expand Down

0 comments on commit df4fef2

Please sign in to comment.