minor #33192 [HttpKernel] Bump dependencies and apply upstream parame…

…ter types (derrabus) This PR was merged into the 5.0-dev branch. Discussion ---------- [HttpKernel] Bump dependencies and apply upstream parameter types | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32179 | License | MIT | Doc PR | N/A This PR bumps some dependencies of the HttpKernel component in order to apply parameter type declarations. Commits ------- aa0fc6f [HttpKernel] Bump dependencies and apply upstream parameter types.
symfony · Aug 19, 2019 · 0b6f45e · 0b6f45e
2 parents 6fd929e + aa0fc6f
commit 0b6f45e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
@@ -33,7 +33,7 @@ public function __construct($paths = [])
     /**
      * {@inheritdoc}
      */
-    public function locate(string $name, string $currentPath = null, $first = true)
+    public function locate(string $name, string $currentPath = null, bool $first = true)
     {
         if ('' == $name) {
             throw new \InvalidArgumentException('An empty file name is not valid to be located.');

diff --git a/src/Symfony/Component/HttpKernel/Config/FileLocator.php b/src/Symfony/Component/HttpKernel/Config/FileLocator.php
@@ -42,7 +42,7 @@ public function __construct(KernelInterface $kernel, string $path = null, array
     /**
      * {@inheritdoc}
      */
-    public function locate($file, $currentPath = null, $first = true)
+    public function locate(string $file, string $currentPath = null, bool $first = true)
     {
         if (isset($file[0]) && '@' === $file[0]) {
             return $this->kernel->locateResource($file, $this->path, $first);

diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
@@ -26,7 +26,7 @@ class TraceableEventDispatcher extends BaseTraceableEventDispatcher
     /**
      * {@inheritdoc}
      */
-    protected function beforeDispatch(string $eventName, $event)
+    protected function beforeDispatch(string $eventName, object $event)
     {
         switch ($eventName) {
             case KernelEvents::REQUEST:
@@ -60,7 +60,7 @@ protected function beforeDispatch(string $eventName, $event)
     /**
      * {@inheritdoc}
      */
-    protected function afterDispatch(string $eventName, $event)
+    protected function afterDispatch(string $eventName, object $event)
     {
         switch ($eventName) {
             case KernelEvents::CONTROLLER_ARGUMENTS:

diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -19,15 +19,15 @@
         "php": "^7.2.9",
         "symfony/error-handler": "^4.4|^5.0",
         "symfony/error-renderer": "^4.4|^5.0",
-        "symfony/event-dispatcher": "^4.4|^5.0",
+        "symfony/event-dispatcher": "^5.0",
         "symfony/http-foundation": "^4.4|^5.0",
         "symfony/polyfill-ctype": "^1.8",
         "symfony/polyfill-php73": "^1.9",
         "psr/log": "~1.0"
     },
     "require-dev": {
         "symfony/browser-kit": "^4.4|^5.0",
-        "symfony/config": "^4.4|^5.0",
+        "symfony/config": "^5.0",
         "symfony/console": "^4.4|^5.0",
         "symfony/css-selector": "^4.4|^5.0",
         "symfony/dependency-injection": "^4.4|^5.0",
@@ -48,7 +48,7 @@
     },
     "conflict": {
         "symfony/browser-kit": "<4.4",
-        "symfony/config": "<4.4",
+        "symfony/config": "<5.0",
         "symfony/dependency-injection": "<4.4",
         "symfony/translation": "<4.4",
         "symfony/var-dumper": "<4.4",