Skip to content

Commit 3e3b3f1

Browse files
Merge branch '4.4'
* 4.4: (53 commits) Fix Twig 1.x compatibility Deprecating templateExists method [Translator] Improve farsi(persian) translations for Form [Validator] Fix Changelog for #31511 [Lock][Console] bump lock requirement in console [Lock] minor: add missing alias for PersistenStoreInterface Improve fa translations Dynamic bundle assets [Lock] rename and deprecate Factory into LockFactory [Debug] Restoring back the state of the Debug component (1st step) Spell "triggering" properly [Lock] Fix tests Added tests to cover the possibility of having scalars as services. fixed CS [Lock] Split \"StoreInterface\" into multiple interfaces with less responsability [VarDumper] Let browsers trigger their own search on double CMD/CTRL + F hit [Validator] Allow to use property paths to get limits in range constraint Fix missing deprecations fixed tests on old PHP versions [FrameworkBundle] Inform the user when save_path will be ignored ...
2 parents bbccbc7 + 3d65739 commit 3e3b3f1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

DeprecationErrorHandler/Deprecation.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function __construct($message, array $trace, $file)
7676
// No-op
7777
}
7878
$line = $trace[$i];
79-
$this->trigerringFilePathType = $this->getPathType($file);
79+
$this->triggeringFilePathType = $this->getPathType($file);
8080
if (isset($line['object']) || isset($line['class'])) {
8181
if (isset($line['class']) && 0 === strpos($line['class'], SymfonyTestsListenerFor::class)) {
8282
$parsedMsg = unserialize($this->message);
@@ -88,7 +88,7 @@ public function __construct($message, array $trace, $file)
8888
// then we need to use the serialized information to determine
8989
// if the error has been triggered from vendor code.
9090
if (isset($parsedMsg['triggering_file'])) {
91-
$this->trigerringFilePathType = $this->getPathType($parsedMsg['triggering_file']);
91+
$this->triggeringFilePathType = $this->getPathType($parsedMsg['triggering_file']);
9292
}
9393

9494
return;
@@ -177,10 +177,10 @@ public function isLegacy($utilPrefix)
177177
*/
178178
public function getType()
179179
{
180-
if (self::PATH_TYPE_SELF === $this->trigerringFilePathType) {
180+
if (self::PATH_TYPE_SELF === $this->triggeringFilePathType) {
181181
return self::TYPE_SELF;
182182
}
183-
if (self::PATH_TYPE_UNDETERMINED === $this->trigerringFilePathType) {
183+
if (self::PATH_TYPE_UNDETERMINED === $this->triggeringFilePathType) {
184184
return self::TYPE_UNDETERMINED;
185185
}
186186
$erroringFile = $erroringPackage = null;

0 commit comments

Comments
 (0)