Skip to content

Commit c33d7be

Browse files
Merge branch '4.4'
* 4.4: cs fix Fix inconsistent return points. [Config] Add handling for ignored keys in ArrayNode::mergeValues. Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null cs fix cs fix Fix missing exporter in PHPUnit constraint poylfill added `Process::getLastOutputTime()` method [Router] Fix TraceableUrlMatcher behaviour with trailing slash [HttpKernel] Remove outdated docblock comment Fix handling for session parameters Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"
2 parents 320009c + 5de91fa commit c33d7be

File tree

7 files changed

+14
-6
lines changed

7 files changed

+14
-6
lines changed

Data/Generator/CurrencyDataGenerator.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
9090

9191
return $data;
9292
}
93+
94+
return null;
9395
}
9496

9597
/**

Data/Generator/LanguageDataGenerator.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
141141

142142
return $data;
143143
}
144+
145+
return null;
144146
}
145147

146148
/**

Data/Generator/RegionDataGenerator.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
124124

125125
return $data;
126126
}
127+
128+
return null;
127129
}
128130

129131
/**

Data/Generator/ScriptDataGenerator.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
7777

7878
return $data;
7979
}
80+
81+
return null;
8082
}
8183

8284
/**

DateFormatter/DateFormat/FullTransformer.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ private function formatReplace(string $dateChars, \DateTime $dateTime): string
106106
if (false !== strpos($this->notImplementedChars, $dateChars[0])) {
107107
throw new NotImplementedException(sprintf('Unimplemented date character "%s" in format "%s"', $dateChars[0], $this->pattern));
108108
}
109+
110+
return '';
109111
}
110112

111113
/**
@@ -176,6 +178,8 @@ private function getReverseMatchingRegExp(string $pattern): string
176178

177179
return "(?P<$captureName>".$transformer->getReverseMatchingRegExp($length).')';
178180
}
181+
182+
return null;
179183
}, $escapedPattern);
180184

181185
return $reverseMatchingRegExp;

Locale.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,7 @@ public static function getFallback(string $locale): ?string
102102

103103
// Don't return default fallback for "root", "meta" or others
104104
// Normal locales have two or three letters
105-
if (\strlen($locale) < 4) {
106-
return self::$defaultFallback;
107-
}
108-
109-
return null;
105+
return \strlen($locale) < 4 ? self::$defaultFallback : null;
110106
}
111107

112108
/**

Resources/bin/common.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function get_icu_version_from_genrb($genrb)
6262
}
6363

6464
if (!preg_match('/ICU version ([\d\.]+)/', implode('', $output), $matches)) {
65-
return;
65+
return null;
6666
}
6767

6868
return $matches[1];

0 commit comments

Comments
 (0)