fixed ...Holder ...holder typo

NeatNerdPrime · Dec 3, 2019 · 3840378 · 3840378
1 parent a4e436b
commit 3840378
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 36 deletions.
diff --git a/Services/Certificate/classes/Cron/class.ilCertificateTypeClassMap.php b/Services/Certificate/classes/Cron/class.ilCertificateTypeClassMap.php
@@ -8,8 +8,8 @@ class ilCertificateTypeClassMap
 {
 	private $typeClassMap = array(
 		'crs'  => array('placeholder' => ilCoursePlaceholderValues::class),
-		'tst'  => array('placeholder' => ilTestPlaceHolderValues::class),
-		'exc'  => array('placeholder' => ilExercisePlaceHolderValues::class),
+		'tst'  => array('placeholder' => ilTestPlaceholderValues::class),
+		'exc'  => array('placeholder' => ilExercisePlaceholderValues::class),
 		'sahs' => array('placeholder' => ilScormPlaceholderValues::class),
 	);
 

diff --git a/Services/Certificate/classes/Gui/class.ilCertificateFactory.php b/Services/Certificate/classes/Gui/class.ilCertificateFactory.php
@@ -19,7 +19,7 @@ public function create(ilObject $object) : ilCertificate
 			case 'tst':
 				$adapter = new ilTestCertificateAdapter($object);
 				$placeholderDescriptionObject = new ilTestPlaceholderDescription();
-				$placeholderValuesObject = new ilTestPlaceHolderValues();
+				$placeholderValuesObject = new ilTestPlaceholderValues();
 				$certificatePath = ilCertificatePathConstants::TEST_PATH . $object->getId() . '/';
 				break;
 			case 'crs':
@@ -37,7 +37,7 @@ public function create(ilObject $object) : ilCertificate
 			case 'exc':
 				$adapter = new ilExerciseCertificateAdapter($object);
 				$placeholderDescriptionObject = new ilExercisePlaceholderDescription();
-				$placeholderValuesObject = new ilExercisePlaceHolderValues();
+				$placeholderValuesObject = new ilExercisePlaceholderValues();
 				$certificatePath = ilCertificatePathConstants::EXERCISE_PATH . $object->getId() . '/';
 				break;
 			default:

diff --git a/Services/Certificate/classes/Gui/class.ilCertificateGUIFactory.php b/Services/Certificate/classes/Gui/class.ilCertificateGUIFactory.php
@@ -43,7 +43,7 @@ public function create(\ilObject $object) : ilCertificateGUI
 		switch ($type) {
 			case 'tst':
 				$placeholderDescriptionObject = new ilTestPlaceholderDescription();
-				$placeholderValuesObject = new ilTestPlaceHolderValues();
+				$placeholderValuesObject = new ilTestPlaceholderValues();
 				$adapter = new ilTestCertificateAdapter($object);
 
 				$certificatePath = ilCertificatePathConstants::TEST_PATH . $objectId . '/';
@@ -91,7 +91,7 @@ public function create(\ilObject $object) : ilCertificateGUI
 			case 'exc':
 				$adapter = new ilExerciseCertificateAdapter($object);
 				$placeholderDescriptionObject = new ilExercisePlaceholderDescription();
-				$placeholderValuesObject = new ilExercisePlaceHolderValues();
+				$placeholderValuesObject = new ilExercisePlaceholderValues();
 
 				$certificatePath = ilCertificatePathConstants::EXERCISE_PATH . $objectId . '/';
 

diff --git a/Services/Certificate/classes/Placeholder/Values/class.ilCoursePlaceholderValues.php b/Services/Certificate/classes/Placeholder/Values/class.ilCoursePlaceholderValues.php
@@ -9,7 +9,7 @@ class ilCoursePlaceholderValues implements ilCertificatePlaceholderValues
 	/**
 	 * @var ilDefaultPlaceholderValues
 	 */
-	private $defaultPlaceHolderValuesObject;
+	private $defaultPlaceholderValuesObject;
 
 	/**
 	 * @var ilLanguage|null
@@ -82,7 +82,7 @@ public function __construct(
         }
 		$this->dateHelper = $dateHelper;
 
-		$this->defaultPlaceHolderValuesObject = $defaultPlaceholderValues;
+		$this->defaultPlaceholderValuesObject = $defaultPlaceholderValues;
 	}
 
 	/**
@@ -102,7 +102,7 @@ public function getPlaceholderValues(int $userId, int $objId) : array
 	{
 		$courseObject = $this->objectHelper->getInstanceByObjId($objId);
 
-		$placeholders = $this->defaultPlaceHolderValuesObject->getPlaceholderValues($userId, $objId);
+		$placeholders = $this->defaultPlaceholderValuesObject->getPlaceholderValues($userId, $objId);
 
 		$completionDate = $this->participantsHelper->getDateTimeOfPassed($objId, $userId);
 
@@ -130,7 +130,7 @@ public function getPlaceholderValues(int $userId, int $objId) : array
 	 */
 	public function getPlaceholderValuesForPreview(int $userId, int $objId)
 	{
-		$placeholders =  $this->defaultPlaceHolderValuesObject->getPlaceholderValuesForPreview($userId, $objId);
+		$placeholders =  $this->defaultPlaceholderValuesObject->getPlaceholderValuesForPreview($userId, $objId);
 
 		$object = $this->objectHelper->getInstanceByObjId($objId);
 

diff --git a/...ues/class.ilExercisePlaceHolderValues.php → ...ues/class.ilExercisePlaceholderValues.php b/...ues/class.ilExercisePlaceHolderValues.php → ...ues/class.ilExercisePlaceholderValues.php
@@ -4,7 +4,7 @@
 /**
  * @author  Niels Theen <[email protected]>
  */
-class ilExercisePlaceHolderValues implements ilCertificatePlaceholderValues
+class ilExercisePlaceholderValues implements ilCertificatePlaceholderValues
 {
 	/**
 	 * @var ilLanguage|null
@@ -14,7 +14,7 @@ class ilExercisePlaceHolderValues implements ilCertificatePlaceholderValues
 	/**
 	 * @var ilDefaultPlaceholderValues|null
 	 */
-	private $defaultPlaceHolderValuesObject;
+	private $defaultPlaceholderValuesObject;
 
 	/**
 	 * @var ilCertificateLPMarksHelper|null
@@ -78,7 +78,7 @@ public function __construct(
 		if (null === $defaultPlaceholderValues) {
 			$defaultPlaceholderValues = new ilDefaultPlaceholderValues();
 		}
-		$this->defaultPlaceHolderValuesObject = $defaultPlaceholderValues;
+		$this->defaultPlaceholderValuesObject = $defaultPlaceholderValues;
 
 		if (null === $objectHelper) {
 			$objectHelper = new ilCertificateObjectHelper();
@@ -134,7 +134,7 @@ public function getPlaceholderValues(int $userId, int $objId) : array
 
 		$completionDate = $this->lpStatusHelper->lookupStatusChanged($objId, $userId);
 
-		$placeHolders = $this->defaultPlaceHolderValuesObject->getPlaceholderValues($userId, $objId);
+		$placeHolders = $this->defaultPlaceholderValuesObject->getPlaceholderValues($userId, $objId);
 
 		$placeHolders['RESULT_PASSED']      = $this->utilHelper->prepareFormOutput($this->language->txt('exc_' . $status));
 		$placeHolders['RESULT_MARK']        = $this->utilHelper->prepareFormOutput($mark);
@@ -164,7 +164,7 @@ public function getPlaceholderValues(int $userId, int $objId) : array
 	 */
 	public function getPlaceholderValuesForPreview(int $userId, int $objId) : array
 	{
-		$placeholders = $this->defaultPlaceHolderValuesObject->getPlaceholderValuesForPreview($userId, $objId);
+		$placeholders = $this->defaultPlaceholderValuesObject->getPlaceholderValuesForPreview($userId, $objId);
 
 		$object = $this->objectHelper->getInstanceByObjId($objId);
 

diff --git a/Services/Certificate/classes/Placeholder/Values/class.ilScormPlaceholderValues.php b/Services/Certificate/classes/Placeholder/Values/class.ilScormPlaceholderValues.php
@@ -14,7 +14,7 @@ class ilScormPlaceholderValues implements ilCertificatePlaceholderValues
 	/**
 	 * @var ilDefaultPlaceholderValues|null
 	 */
-	private $defaultPlaceHolderValuesObject;
+	private $defaultPlaceholderValuesObject;
 
 	/**
 	 * @var ilCertificateDateHelper|null
@@ -68,7 +68,7 @@ public function __construct(
 		if (null === $defaultPlaceholderValues) {
 			$defaultPlaceholderValues = new ilDefaultPlaceholderValues();
 		}
-		$this->defaultPlaceHolderValuesObject = $defaultPlaceholderValues;
+		$this->defaultPlaceholderValuesObject = $defaultPlaceholderValues;
 
 		if (null === $dateHelper) {
 			$dateHelper = new ilCertificateDateHelper();
@@ -131,7 +131,7 @@ public function getPlaceholderValues(int $userId, int $objId) : array
 
 		$completionDate = $this->lpStatusHelper->lookupStatusChanged($objId, $userId);
 
-		$placeHolders = $this->defaultPlaceHolderValuesObject->getPlaceholderValues($userId, $objId);
+		$placeHolders = $this->defaultPlaceholderValuesObject->getPlaceholderValues($userId, $objId);
 
 		$placeHolders['SCORM_TITLE']        = $this->utilHelper->prepareFormOutput($object->getTitle());
 		$placeHolders['SCORM_POINTS']       = $txtPoints;
@@ -209,7 +209,7 @@ public function getPlaceholderValues(int $userId, int $objId) : array
 	 */
 	public function getPlaceholderValuesForPreview(int $userId, int $objId) : array
 	{
-		$placeholders = $this->defaultPlaceHolderValuesObject->getPlaceholderValuesForPreview($userId, $objId);
+		$placeholders = $this->defaultPlaceholderValuesObject->getPlaceholderValuesForPreview($userId, $objId);
 
 		$object = $this->objectHelper->getInstanceByObjId($objId);
 

diff --git a/.../Values/class.ilTestPlaceHolderValues.php → .../Values/class.ilTestPlaceholderValues.php b/.../Values/class.ilTestPlaceHolderValues.php → .../Values/class.ilTestPlaceholderValues.php
@@ -4,12 +4,12 @@
 /**
  * @author  Niels Theen <[email protected]>
  */
-class ilTestPlaceHolderValues implements ilCertificatePlaceholderValues
+class ilTestPlaceholderValues implements ilCertificatePlaceholderValues
 {
 	/**
 	 * @var ilDefaultPlaceholderValues
 	 */
-	private $defaultPlaceHolderValuesObject;
+	private $defaultPlaceholderValuesObject;
 
 	/**
 	 * @var ilCertificateObjectHelper|null
@@ -75,7 +75,7 @@ public function __construct(
 		if (null === $defaultPlaceholderValues) {
 			$defaultPlaceholderValues = new ilDefaultPlaceholderValues();
 		}
-		$this->defaultPlaceHolderValuesObject = $defaultPlaceholderValues;
+		$this->defaultPlaceholderValuesObject = $defaultPlaceholderValues;
 
 		if (null === $objectHelper) {
 			$objectHelper = new ilCertificateObjectHelper();
@@ -153,7 +153,7 @@ public function getPlaceholderValues(int $userId, int $objId): array
 			$completionDate = $this->lpStatusHelper->lookupStatusChanged($objId, $userId);
 		}
 
-		$placeholders = $this->defaultPlaceHolderValuesObject->getPlaceholderValues($userId, $objId);
+		$placeholders = $this->defaultPlaceholderValuesObject->getPlaceholderValues($userId, $objId);
 
 		$placeholders['RESULT_PASSED']      = $this->utilHelper->prepareFormOutput($passed);
 		$placeholders['RESULT_POINTS']      = $this->utilHelper->prepareFormOutput($result_array['test']['total_reached_points']);
@@ -187,7 +187,7 @@ public function getPlaceholderValues(int $userId, int $objId): array
 	 */
 	public function getPlaceholderValuesForPreview(int $userId, int $objId) : array
 	{
-		$placeholders = $this->defaultPlaceHolderValuesObject->getPlaceholderValuesForPreview($userId, $objId);
+		$placeholders = $this->defaultPlaceholderValuesObject->getPlaceholderValuesForPreview($userId, $objId);
 
 		$object = $this->objectHelper->getInstanceByObjId($objId);
 

diff --git a/Services/Certificate/test/ilCertificateTypeClassMapTest.php b/Services/Certificate/test/ilCertificateTypeClassMapTest.php
@@ -29,14 +29,14 @@ public function testFetchTestPlaceHolderClass()
 	{
 		$class = $this->classMap->getPlaceHolderClassNameByType('tst');
 
-		$this->assertEquals('ilTestPlaceHolderValues', $class);
+		$this->assertEquals('ilTestPlaceholderValues', $class);
 	}
 
 	public function testFetchExercisePlaceHolderClass()
 	{
 		$class = $this->classMap->getPlaceHolderClassNameByType('exc');
 
-		$this->assertEquals('ilExercisePlaceHolderValues', $class);
+		$this->assertEquals('ilExercisePlaceholderValues', $class);
 	}
 
 	public function testFetchScormPlaceHolderClass()

diff --git a/Services/Certificate/test/ilExercisePlaceHolderValuesTest.php b/Services/Certificate/test/ilExercisePlaceHolderValuesTest.php
@@ -4,7 +4,7 @@
 /**
  * @author  Niels Theen <[email protected]>
  */
-class ilExercisePlaceHolderValuesTest extends PHPUnit_Framework_TestCase
+class ilExercisePlaceholderValuesTest extends PHPUnit_Framework_TestCase
 {
 	public function testGetPlaceholderValues()
 	{
@@ -70,7 +70,7 @@ public function testGetPlaceholderValues()
 			->willReturn('2018-09-10 12:01:33');
 
 
-		$placeHolderObject = new ilExercisePlaceHolderValues(
+		$placeHolderObject = new ilExercisePlaceholderValues(
 			$defaultPlaceholders,
 			$language,
 			$objectHelper,
@@ -146,7 +146,7 @@ public function testGetPlaceholderValuesForPreview()
 			->method('getPlaceholderValuesForPreview')
 			->willReturn(array('SOME_PLACEHOLDER' => 'something'));
 
-		$placeHolderObject = new ilExercisePlaceHolderValues(
+		$placeHolderObject = new ilExercisePlaceholderValues(
 			$defaultPlaceholders,
 			$language,
 			$objectHelper,

diff --git a/Services/Certificate/test/ilTestPlaceHolderValuesTest.php b/Services/Certificate/test/ilTestPlaceHolderValuesTest.php
@@ -4,7 +4,7 @@
 /**
  * @author  Niels Theen <[email protected]>
  */
-class ilTestPlaceHolderValuesTest extends PHPUnit_Framework_TestCase
+class ilTestPlaceholderValuesTest extends PHPUnit_Framework_TestCase
 {
 	public function testA()
 	{
@@ -99,7 +99,7 @@ public function testA()
 		$dateHelper->method('formatDateTime')
 			->willReturn('2018-01-12 10:32:01');
 
-		$placeholdervalues = new ilTestPlaceHolderValues(
+		$placeholdervalues = new ilTestPlaceholderValues(
 			$defaultPlaceholderValues,
 			$language,
 			$objectHelper,
@@ -180,7 +180,7 @@ public function testGetPlaceholderValuesForPreview()
 		$dateHelper = $this->getMockBuilder('ilCertificateDateHelper')
 			->getMock();
 
-		$placeholdervalues = new ilTestPlaceHolderValues(
+		$placeholdervalues = new ilTestPlaceholderValues(
 			$defaultPlaceholderValues,
 			$language,
 			$objectHelper,

diff --git a/libs/composer/vendor/composer/autoload_classmap.php b/libs/composer/vendor/composer/autoload_classmap.php
@@ -4323,7 +4323,7 @@
     'ilExerciseMemberTableGUI' => $baseDir . '/../../Modules/Exercise/classes/class.ilExerciseMemberTableGUI.php',
     'ilExerciseMembers' => $baseDir . '/../../Modules/Exercise/classes/class.ilExerciseMembers.php',
     'ilExerciseMembersFilter' => $baseDir . '/../../Modules/Exercise/classes/class.ilExerciseMembersFilter.php',
-    'ilExercisePlaceHolderValues' => $baseDir . '/../../Services/Certificate/classes/Placeholder/Values/class.ilExercisePlaceHolderValues.php',
+    'ilExercisePlaceholderValues' => $baseDir . '/../../Services/Certificate/classes/Placeholder/Values/class.ilExercisePlaceholderValues.php',
     'ilExercisePlaceholderDescription' => $baseDir . '/../../Services/Certificate/classes/Placeholder/Description/class.ilExercisePlaceholderDescription.php',
     'ilExerciseSearch' => $baseDir . '/../../Services/Search/classes/class.ilExerciseSearch.php',
     'ilExerciseSubmissionTableGUI' => $baseDir . '/../../Modules/Exercise/classes/class.ilExerciseSubmissionTableGUI.php',
@@ -6976,7 +6976,7 @@
     'ilTestPasswordProtectionGUI' => $baseDir . '/../../Modules/Test/classes/class.ilTestPasswordProtectionGUI.php',
     'ilTestPersonalDefaultSettingsTableGUI' => $baseDir . '/../../Modules/Test/classes/tables/class.ilTestPersonalDefaultSettingsTableGUI.php',
     'ilTestPersonalSkillsGUI' => $baseDir . '/../../Modules/Test/classes/class.ilTestPersonalSkillsGUI.php',
-    'ilTestPlaceHolderValues' => $baseDir . '/../../Services/Certificate/classes/Placeholder/Values/class.ilTestPlaceHolderValues.php',
+    'ilTestPlaceholderValues' => $baseDir . '/../../Services/Certificate/classes/Placeholder/Values/class.ilTestPlaceholderValues.php',
     'ilTestPlaceholderDescription' => $baseDir . '/../../Services/Certificate/classes/Placeholder/Description/class.ilTestPlaceholderDescription.php',
     'ilTestPlayerAbstractGUI' => $baseDir . '/../../Modules/Test/classes/class.ilTestPlayerAbstractGUI.php',
     'ilTestPlayerCommands' => $baseDir . '/../../Modules/Test/classes/class.ilTestPlayerCommands.php',

diff --git a/libs/composer/vendor/composer/autoload_static.php b/libs/composer/vendor/composer/autoload_static.php
@@ -4668,7 +4668,7 @@ class ComposerStaticInit2fffdf922cf8fdbf1f62eec345993c83
         'ilExerciseMemberTableGUI' => __DIR__ . '/../..' . '/../../Modules/Exercise/classes/class.ilExerciseMemberTableGUI.php',
         'ilExerciseMembers' => __DIR__ . '/../..' . '/../../Modules/Exercise/classes/class.ilExerciseMembers.php',
         'ilExerciseMembersFilter' => __DIR__ . '/../..' . '/../../Modules/Exercise/classes/class.ilExerciseMembersFilter.php',
-        'ilExercisePlaceHolderValues' => __DIR__ . '/../..' . '/../../Services/Certificate/classes/Placeholder/Values/class.ilExercisePlaceHolderValues.php',
+        'ilExercisePlaceholderValues' => __DIR__ . '/../..' . '/../../Services/Certificate/classes/Placeholder/Values/class.ilExercisePlaceholderValues.php',
         'ilExercisePlaceholderDescription' => __DIR__ . '/../..' . '/../../Services/Certificate/classes/Placeholder/Description/class.ilExercisePlaceholderDescription.php',
         'ilExerciseSearch' => __DIR__ . '/../..' . '/../../Services/Search/classes/class.ilExerciseSearch.php',
         'ilExerciseSubmissionTableGUI' => __DIR__ . '/../..' . '/../../Modules/Exercise/classes/class.ilExerciseSubmissionTableGUI.php',
@@ -7321,7 +7321,7 @@ class ComposerStaticInit2fffdf922cf8fdbf1f62eec345993c83
         'ilTestPasswordProtectionGUI' => __DIR__ . '/../..' . '/../../Modules/Test/classes/class.ilTestPasswordProtectionGUI.php',
         'ilTestPersonalDefaultSettingsTableGUI' => __DIR__ . '/../..' . '/../../Modules/Test/classes/tables/class.ilTestPersonalDefaultSettingsTableGUI.php',
         'ilTestPersonalSkillsGUI' => __DIR__ . '/../..' . '/../../Modules/Test/classes/class.ilTestPersonalSkillsGUI.php',
-        'ilTestPlaceHolderValues' => __DIR__ . '/../..' . '/../../Services/Certificate/classes/Placeholder/Values/class.ilTestPlaceHolderValues.php',
+        'ilTestPlaceholderValues' => __DIR__ . '/../..' . '/../../Services/Certificate/classes/Placeholder/Values/class.ilTestPlaceholderValues.php',
         'ilTestPlaceholderDescription' => __DIR__ . '/../..' . '/../../Services/Certificate/classes/Placeholder/Description/class.ilTestPlaceholderDescription.php',
         'ilTestPlayerAbstractGUI' => __DIR__ . '/../..' . '/../../Modules/Test/classes/class.ilTestPlayerAbstractGUI.php',
         'ilTestPlayerCommands' => __DIR__ . '/../..' . '/../../Modules/Test/classes/class.ilTestPlayerCommands.php',