forked from neos/flow-development-collection
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BUGFIX: PHP 7.4 property type declarations (WIP)
This change adjusts the proxy building and dependency injection process to properly handle PHP 7.4 class property type declarations. neos#2114
- Loading branch information
1 parent
b567e7c
commit de0c42b
Showing
9 changed files
with
264 additions
and
105 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
90 changes: 90 additions & 0 deletions
90
Neos.Flow/Classes/ObjectManagement/DependencyInjection/DependencyProxyTrait.php
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 |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| <?php | ||
| namespace Neos\Flow\ObjectManagement\DependencyInjection; | ||
|
|
||
| /* | ||
| * This file is part of the Neos.Flow package. | ||
| * | ||
| * (c) Contributors of the Neos Project - www.neos.io | ||
| * | ||
| * This package is Open Source Software. For the full copyright and license | ||
| * information, please view the LICENSE file which was distributed with this | ||
| * source code. | ||
| */ | ||
|
|
||
| trait DependencyProxyTrait | ||
| { | ||
| /** | ||
| * @var string | ||
| */ | ||
| protected $_dependencyClassName; | ||
|
|
||
| /** | ||
| * @var \Closure | ||
| */ | ||
| protected $_dependencyBuilder; | ||
|
|
||
| /** | ||
| * @var array | ||
| */ | ||
| protected $_dependencyPropertyVariables = []; | ||
|
|
||
| /** | ||
| * Override any possibly existing constructor | ||
| */ | ||
| public function __construct() | ||
| { | ||
| } | ||
|
|
||
| /** | ||
| * Constructs this proxy | ||
| * | ||
| * @param string $className Implementation class name of the dependency to proxy | ||
| * @param \Closure $builder The closure which eventually builds the dependency | ||
| * @return static | ||
| */ | ||
| public static function _createDependencyProxy(string $className, \Closure $builder) | ||
| { | ||
| $instance = new static(); | ||
| $instance->_dependencyClassName = $className; | ||
| $instance->_dependencyBuilder = $builder; | ||
| return $instance; | ||
| } | ||
|
|
||
| /** | ||
| * Activate the dependency and set it in the object. | ||
| * | ||
| * @return object The real dependency object | ||
| * @api | ||
| */ | ||
| public function _activateDependency() | ||
| { | ||
| $realDependency = $this->_dependencyBuilder->__invoke(); | ||
| foreach ($this->_dependencyPropertyVariables as &$propertyVariable) { | ||
| $propertyVariable = $realDependency; | ||
| } | ||
| return $realDependency; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the class name of the proxied dependency | ||
| * | ||
| * @return string Fully qualified class name of the proxied object | ||
| * @api | ||
| */ | ||
| public function _getClassName(): string | ||
| { | ||
| return $this->_dependencyClassName; | ||
| } | ||
|
|
||
| /** | ||
| * Adds another variable by reference where the actual dependency object should | ||
| * be injected into once this proxy is activated. | ||
| * | ||
| * @param mixed &$propertyVariable The variable to replace | ||
| * @return void | ||
| */ | ||
| public function _addPropertyVariable(&$propertyVariable): void | ||
| { | ||
| $this->_dependencyPropertyVariables[] = &$propertyVariable; | ||
| } | ||
| } |
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
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
Oops, something went wrong.