Merge branch '3.4' into 4.0

* 3.4: (22 commits) Add application/ld+json format associated to json [HttpFoundation] Fix false-positive ConflictingHeadersException remove flex-specific suggestion on 3.4 Add check for SecurityBundle in createAccessDeniedException [WebServerBundle] Fix escaping of php binary with arguments Error handlers' $context should be optional as it's deprecated [Serializer] Correct typing mistake in DocBlock [HttpKernel] fix cleaning legacy containers Display n/a for sub-requests time when Stopwatch component is not installed Updating message to inform the user how to install the component [Config] Fix closure CS PHP CS Fixer: use PHPUnit Migration ruleset [Process] Skip false-positive test on Windows/appveyor Update MemcachedTrait.php [Bridge/PhpUnit] thank phpunit/phpunit allow auto_wire for SessionAuthenticationStrategy class [Process] Fix setting empty env vars Fixed 'RouterInteface' typo [Process] Dont use getenv(), it returns arrays and can introduce subtle breaks accros PHP versions [WebServerBundle] fix a bug where require would not require the good file because of env ...

Author: nicolas-grekas

.php_cs.dist

@@ -8,9 +8,10 @@ return PhpCsFixer\Config::create()
  ->setRules(array(
  '@Symfony' => true,
  '@Symfony:risky' => true,
+ '@PHPUnit48Migration:risky' => true,
+ 'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
  'array_syntax' => array('syntax' => 'long'),
  'protected_to_private' => false,
- 'php_unit_dedicate_assert' => array('target' => '3.5'),
  ))
  ->setRiskyAllowed(true)
  ->setFinder(

UPGRADE-4.0.md

@@ -535,11 +535,11 @@ FrameworkBundle
  first argument.
 
  * `RouterDebugCommand::__construct()` now requires an instance of
- `Symfony\Component\Routing\RouterInteface` as
+ `Symfony\Component\Routing\RouterInterface` as
  first argument.
 
  * `RouterMatchCommand::__construct()` now requires an instance of
- `Symfony\Component\Routing\RouterInteface` as
+ `Symfony\Component\Routing\RouterInterface` as
  first argument.
 
  * `TranslationDebugCommand::__construct()` now requires an instance of

src/Symfony/Bridge/PhpUnit/composer.json

@@ -41,6 +41,10 @@
  "extra": {
  "branch-alias": {
  "dev-master": "4.0-dev"
+ },
+ "thanks": {
+ "name": "phpunit/phpunit",
+ "url": "https://github.com/sebastianbergmann/phpunit"
  }
  }
 }

src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

@@ -67,10 +67,10 @@ CHANGELOG
  `Symfony\Component\EventDispatcher\EventDispatcherInterface` as
  first argument
  * `RouterDebugCommand::__construct()` now takes an instance of
- `Symfony\Component\Routing\RouterInteface` as
+ `Symfony\Component\Routing\RouterInterface` as
  first argument
  * `RouterMatchCommand::__construct()` now takes an instance of
- `Symfony\Component\Routing\RouterInteface` as
+ `Symfony\Component\Routing\RouterInterface` as
  first argument
  * `TranslationDebugCommand::__construct()` now takes an instance of
  `Symfony\Component\Translation\TranslatorInterface` as

src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php

@@ -289,10 +289,16 @@ protected function createNotFoundException(string $message = 'Not Found', \Excep
  *
  * throw $this->createAccessDeniedException('Unable to access this page!');
  *
+ * @throws \LogicException If the Security component is not available
+ *
  * @final since version 3.4
  */
  protected function createAccessDeniedException(string $message = 'Access Denied.', \Exception $previous = null): AccessDeniedException
  {
+ if (!class_exists(AccessDeniedException::class)) {
+ throw new \LogicException('You can not use the "createAccessDeniedException" method if the Security component is not available.');
+ }
+
  return new AccessDeniedException($message, $previous);
  }
 

src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml

@@ -62,6 +62,7 @@
  <service id="security.authentication.session_strategy" class="Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy">
  <argument>%security.authentication.session_strategy.strategy%</argument>
  </service>
+ <service id="Symfony\Component\Security\Http\Session\SessionAuthenticationStrategyInterface" alias="security.authentication.session_strategy" />
 
  <service id="security.encoder_factory.generic" class="Symfony\Component\Security\Core\Encoder\EncoderFactory">
  <argument type="collection" />

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig

@@ -14,10 +14,12 @@
  } %}
 {% endif %}
 
+{% set has_time_events = collector.events|length > 0 %}
+
 {% block toolbar %}
- {% set total_time = collector.events|length ? '%.0f'|format(collector.duration) : 'n/a' %}
+ {% set total_time = has_time_events ? '%.0f'|format(collector.duration) : 'n/a' %}
  {% set initialization_time = collector.events|length ? '%.0f'|format(collector.inittime) : 'n/a' %}
- {% set status_color = collector.events|length and collector.duration > 1000 ? 'yellow' : '' %}
+ {% set status_color = has_time_events and collector.duration > 1000 ? 'yellow' : '' %}
 
  {% set icon %}
  {{ include('@WebProfiler/Icon/time.svg') }}
@@ -75,10 +77,14 @@
  <span class="label">Sub-Request{{ profile.children|length > 1 ? 's' }}</span>
  </div>
 
- {% set subrequests_time = 0 %}
- {% for child in profile.children %}
- {% set subrequests_time = subrequests_time + child.getcollector('time').events.__section__.duration %}
- {% endfor %}
+ {% if has_time_events %}
+ {% set subrequests_time = 0 %}
+ {% for child in profile.children %}
+ {% set subrequests_time = subrequests_time + child.getcollector('time').events.__section__.duration %}
+ {% endfor %}
+ {% else %}
+ {% set subrequests_time = 'n/a' %}
+ {% endif %}
 
  <div class="metric">
  <span class="value">{{ subrequests_time }} <span class="unit">ms</span></span>

src/Symfony/Bundle/WebServerBundle/Resources/router.php

@@ -30,7 +30,7 @@
  return false;
 }
 
-$script = getenv('APP_FRONT_CONTROLLER') ?: 'index.php';
+$script = isset($_ENV['APP_FRONT_CONTROLLER']) ? $_ENV['APP_FRONT_CONTROLLER'] : 'index.php';
 
 $_SERVER = array_merge($_SERVER, $_ENV);
 $_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.$script;

src/Symfony/Bundle/WebServerBundle/WebServer.php

@@ -146,11 +146,11 @@ public function isRunning($pidFile = null)
  private function createServerProcess(WebServerConfig $config)
  {
  $finder = new PhpExecutableFinder();
- if (false === $binary = $finder->find()) {
+ if (false === $binary = $finder->find(false)) {
  throw new \RuntimeException('Unable to find the PHP binary.');
  }
 
- $process = new Process(array($binary, '-S', $config->getAddress(), $config->getRouter()));
+ $process = new Process(array_merge(array($binary), $finder->findArguments(), array('-dvariables_order=EGPCS', '-S', $config->getAddress(), $config->getRouter())));
  $process->setWorkingDirectory($config->getDocumentRoot());
  $process->setTimeout(null);
 

src/Symfony/Bundle/WebServerBundle/WebServerConfig.php

@@ -32,7 +32,7 @@ public function __construct(string $documentRoot, string $env, string $address =
  throw new \InvalidArgumentException(sprintf('Unable to find the front controller under "%s" (none of these files exist: %s).', $documentRoot, implode(', ', $this->getFrontControllerFileNames($env))));
  }
 
- putenv('APP_FRONT_CONTROLLER='.$file);
+ $_ENV['APP_FRONT_CONTROLLER'] = $file;
 
  $this->documentRoot = $documentRoot;
  $this->env = $env;