-
Notifications
You must be signed in to change notification settings - Fork 351
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'remotes/dev/1.10' into 1.10
- Loading branch information
Showing
150 changed files
with
3,311 additions
and
747 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
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
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
2 changes: 1 addition & 1 deletion
2
...ivityList/js/activityItemTemplate.js.twig → ...ityList/js/activityItemTemplate.html.twig
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
File renamed without changes.
File renamed without changes.
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
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
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
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
File renamed without changes.
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,74 @@ | ||
| <?php | ||
|
|
||
| namespace Oro\Bundle\ConfigBundle\Config; | ||
|
|
||
| class ConfigChangeSet | ||
| { | ||
| /** @var array */ | ||
| protected $changeSet = []; | ||
|
|
||
| /** | ||
| * @param array $changeSet | ||
| */ | ||
| public function __construct(array $changeSet) | ||
| { | ||
| $this->changeSet = $changeSet; | ||
| } | ||
|
|
||
| /** | ||
| * Returns config change set | ||
| * | ||
| * @return array [name => ['new' => value, 'old' => value], ...] | ||
| */ | ||
| public function getChanges() | ||
| { | ||
| return $this->changeSet; | ||
| } | ||
|
|
||
| /** | ||
| * Checks whenever configuration value is changed | ||
| * | ||
| * @param string $name | ||
| * | ||
| * @return bool | ||
| */ | ||
| public function isChanged($name) | ||
| { | ||
| return !empty($this->changeSet[$name]); | ||
| } | ||
|
|
||
| /** | ||
| * Retrieve new value from change set | ||
| * | ||
| * @param string $name | ||
| * | ||
| * @return mixed | ||
| * @throws \LogicException | ||
| * | ||
| */ | ||
| public function getNewValue($name) | ||
| { | ||
| if (!$this->isChanged($name)) { | ||
| throw new \LogicException('Could not retrieve value for given key'); | ||
| } | ||
|
|
||
| return $this->changeSet[$name]['new']; | ||
| } | ||
|
|
||
| /** | ||
| * Retrieve old value from change set | ||
| * | ||
| * @param string $name | ||
| * | ||
| * @return mixed | ||
| * @throws \LogicException | ||
| */ | ||
| public function getOldValue($name) | ||
| { | ||
| if (!$this->isChanged($name)) { | ||
| throw new \LogicException('Could not retrieve value for given key'); | ||
| } | ||
|
|
||
| return $this->changeSet[$name]['old']; | ||
| } | ||
| } |
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.