Merge branch '4.4'

* 4.4:
  [4.4] Add return types on internal|final|private methods (bis)
  [Ldap] Add missing LdapUser::setPassword()
  Add types to roting and DI configuration traits.

Author: nicolas-grekas

Loader/Configurator/CollectionConfigurator.php

@@ -60,7 +60,7 @@ final public function collection($name = ''): self
      *
      * @return $this
      */
-    final public function prefix($prefix): object
+    final public function prefix($prefix): self
     {
         if (\is_array($prefix)) {
             if (null === $this->parentPrefixes) {

Loader/Configurator/ImportConfigurator.php

@@ -41,7 +41,7 @@ public function __destruct()
      *
      * @return $this
      */
-    final public function prefix($prefix, bool $trailingSlashOnRoot = true): object
+    final public function prefix($prefix, bool $trailingSlashOnRoot = true): self
     {
         if (!\is_array($prefix)) {
             $this->route->addPrefix($prefix);
@@ -84,7 +84,7 @@ final public function prefix($prefix, bool $trailingSlashOnRoot = true): object
      *
      * @return $this
      */
-    final public function namePrefix(string $namePrefix): object
+    final public function namePrefix(string $namePrefix): self
     {
         $this->route->addNamePrefix($namePrefix);
 

Loader/Configurator/Traits/RouteTrait.php

@@ -26,7 +26,7 @@ trait RouteTrait
      *
      * @return $this
      */
-    final public function defaults(array $defaults): object
+    final public function defaults(array $defaults): self
     {
         $this->route->addDefaults($defaults);
 
@@ -38,7 +38,7 @@ final public function defaults(array $defaults): object
      *
      * @return $this
      */
-    final public function requirements(array $requirements): object
+    final public function requirements(array $requirements): self
     {
         $this->route->addRequirements($requirements);
 
@@ -50,7 +50,7 @@ final public function requirements(array $requirements): object
      *
      * @return $this
      */
-    final public function options(array $options): object
+    final public function options(array $options): self
     {
         $this->route->addOptions($options);
 
@@ -62,7 +62,7 @@ final public function options(array $options): object
      *
      * @return $this
      */
-    final public function utf8(bool $utf8 = true): object
+    final public function utf8(bool $utf8 = true): self
     {
         $this->route->addOptions(['utf8' => $utf8]);
 
@@ -74,7 +74,7 @@ final public function utf8(bool $utf8 = true): object
      *
      * @return $this
      */
-    final public function condition(string $condition): object
+    final public function condition(string $condition): self
     {
         $this->route->setCondition($condition);
 
@@ -86,7 +86,7 @@ final public function condition(string $condition): object
      *
      * @return $this
      */
-    final public function host(string $pattern): object
+    final public function host(string $pattern): self
     {
         $this->route->setHost($pattern);
 
@@ -101,7 +101,7 @@ final public function host(string $pattern): object
      *
      * @return $this
      */
-    final public function schemes(array $schemes): object
+    final public function schemes(array $schemes): self
     {
         $this->route->setSchemes($schemes);
 
@@ -116,7 +116,7 @@ final public function schemes(array $schemes): object
      *
      * @return $this
      */
-    final public function methods(array $methods): object
+    final public function methods(array $methods): self
     {
         $this->route->setMethods($methods);
 
@@ -130,7 +130,7 @@ final public function methods(array $methods): object
      *
      * @return $this
      */
-    final public function controller($controller): object
+    final public function controller($controller): self
     {
         $this->route->addDefaults(['_controller' => $controller]);
 
@@ -142,7 +142,7 @@ final public function controller($controller): object
      *
      * @return $this
      */
-    final public function locale(string $locale): object
+    final public function locale(string $locale): self
     {
         $this->route->addDefaults(['_locale' => $locale]);
 
@@ -154,7 +154,7 @@ final public function locale(string $locale): object
      *
      * @return $this
      */
-    final public function format(string $format): object
+    final public function format(string $format): self
     {
         $this->route->addDefaults(['_format' => $format]);