-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
5 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
/** | ||
* This file is part of contao-community-alliance/dc-general. | ||
* | ||
* (c) 2013-2019 Contao Community Alliance. | ||
* (c) 2013-2023 Contao Community Alliance. | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
|
@@ -14,7 +14,8 @@ | |
* @author Christian Schiffler <[email protected]> | ||
* @author Tristan Lins <[email protected]> | ||
* @author Sven Baumann <[email protected]> | ||
* @copyright 2013-2019 Contao Community Alliance. | ||
* @author Ingolf Steinhardt <[email protected]> | ||
* @copyright 2013-2023 Contao Community Alliance. | ||
* @license https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later | ||
* @filesource | ||
*/ | ||
|
@@ -118,15 +119,15 @@ public static function callArgs($callback, array $args = []) | |
/** | ||
* Evaluate the callback and create an object instance if required and possible. | ||
* | ||
* @param array|array{0: class-string, 1: string}|callable $callback The callback to invoke. | ||
* @param array|array{0: class-string|string, 1: string}|callable $callback The callback to invoke. | ||
* | ||
* @return array|callable | ||
* | ||
* @SuppressWarnings(PHPMD.CyclomaticComplexity) | ||
*/ | ||
protected static function evaluateCallback($callback) | ||
{ | ||
if (is_array($callback) && (2 === count($callback)) && class_exists($callback[0]) && is_string($callback[1])) { | ||
if (is_array($callback) && (2 === count($callback)) && is_string($callback[0]) && is_string($callback[1])) { | ||
$serviceCallback = static::evaluateServiceCallback($callback); | ||
if ($serviceCallback[0] !== $callback[0]) { | ||
return $serviceCallback; | ||
|